August 2020 - Linux-stable-mirror

[PATCH] Revert "ath: add support for special 0x0 regulatory domain"

by Brian Norris

This reverts commit 2dc016599cfa9672a147528ca26d70c3654a5423. Users are reporting regressions in regulatory domain detection and channel availability. The problem this was trying to resolve was fixed in firmware anyway: QCA6174 hw3.0: sdio-4.4.1: add firmware.bin_WLAN.RMH.4.4.1-00042 https://github.com/kvalo/ath10k-firmware/commit/4d382787f0efa77dba40394e0bc… Link: https://bbs.archlinux.org/viewtopic.php?id=254535 Link: http://lists.infradead.org/pipermail/ath10k/2020-April/014871.html Link: http://lists.infradead.org/pipermail/ath10k/2020-May/015152.html Fixes: 2dc016599cfa ("ath: add support for special 0x0 regulatory domain") Cc: <stable(a)vger.kernel.org> Cc: Wen Gong <wgong(a)codeaurora.org> Signed-off-by: Brian Norris <briannorris(a)chromium.org> --- drivers/net/wireless/ath/regd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c index bee9110b91f3..20f4f8ea9f89 100644 --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c @@ -666,14 +666,14 @@ ath_regd_init_wiphy(struct ath_regulatory *reg, /* * Some users have reported their EEPROM programmed with - * 0x8000 or 0x0 set, this is not a supported regulatory - * domain but since we have more than one user with it we - * need a solution for them. We default to 0x64, which is - * the default Atheros world regulatory domain. + * 0x8000 set, this is not a supported regulatory domain + * but since we have more than one user with it we need + * a solution for them. We default to 0x64, which is the + * default Atheros world regulatory domain. */ static void ath_regd_sanitize(struct ath_regulatory *reg) { - if (reg->current_rd != COUNTRY_ERD_FLAG && reg->current_rd != 0) + if (reg->current_rd != COUNTRY_ERD_FLAG) return; printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n"); reg->current_rd = 0x64; -- 2.27.0.rc0.183.gde8f92d652-goog

2 years, 3 months

8
10
0 0

[PATCH 1/2] x86/mpparse: avoid overwriting boot_cpu_physical_apicid

by Kevin Mitchell

When booting with ACPI unavailable or disabled, get_smp_config() ends up calling MP_processor_info() for each CPU found in the MPS table. Previously, this resulted in boot_cpu_physical_apicid getting unconditionally overwritten by the apicid of whatever processor had the CPU_BOOTPROCESSOR flag. This occurred even if boot_cpu_physical_apicid had already been more reliably determined in register_lapic_address() by calling read_apic_id() from the actual boot processor. Ordinariliy, this is not a problem because the boot processor really is the one with the CPU_BOOTPROCESSOR flag. However, kexec is an exception in which the kernel may be booted from any processor regardless of the MPS table contents. In this case, boot_cpu_physical_apicid may not indicate the actual boot processor. This was particularly problematic when the second kernel was booted with NR_CPUS fewer than the number of physical processors. It's the job of generic_processor_info() to decide which CPUs to bring up in this case. That obviously must include the real boot processor which it takes care to save a slot for. It relies upon the contents of boot_cpu_physical_apicid to do this, which if incorrect, may result in the boot processor getting left out. This condition can be discovered by smp_sanity_check() and rectified by adding the boot processor to the phys_cpu_present_map with the warning "weird, boot CPU (#%d) not listed by the BIOS". However, commit 3e730dad3b6da ("x86/apic: Unify interrupt mode setup for SMP-capable system") caused setup_local_APIC() to be called before this could happen resulting in a BUG_ON(!apic->apic_id_registered()): [ 0.655452] ------------[ cut here ]------------ [ 0.660610] Kernel BUG at setup_local_APIC+0x74/0x280 [verbose debug info unavailable] [ 0.669466] invalid opcode: 0000 [#1] SMP [ 0.673948] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.19.109.Ar-16509018.eostrunkkernel419 #1 [ 0.683670] Hardware name: Quanta Quanta LY6 (1LY6UZZ0FBC), BIOS 1.0.6.0-e7d6a55 11/26/2015 [ 0.693007] RIP: 0010:setup_local_APIC+0x74/0x280 [ 0.698264] Code: 80 e4 fe bf f0 00 00 00 89 c6 48 8b 05 0f 1a 8e 00 ff 50 10 e8 12 53 fd ff 48 8b 05 00 1a 8e 00 ff 90 a0 00 00 00 85 c0 75 02 <0f> 0b 48 8b 05 ed 19 8e 00 41 be 00 02 00 00 ff 90 b0 00 00 00 48 [ 0.719251] RSP: 0000:ffffffff81a03e20 EFLAGS: 00010246 [ 0.725091] RAX: 0000000000000000 RBX: 0000000000000003 RCX: 0000000000000000 [ 0.733066] RDX: 0000000000000000 RSI: 000000000000000f RDI: 0000000000000020 [ 0.741041] RBP: ffffffff81a03e98 R08: 0000000000000002 R09: 0000000000000000 [ 0.749014] R10: ffffffff81a204e0 R11: ffffffff81b50ea7 R12: 0000000000000000 [ 0.756989] R13: ffffffff81aef920 R14: ffffffff81af60a0 R15: 0000000000000000 [ 0.764965] FS: 0000000000000000(0000) GS:ffff888036800000(0000) knlGS:0000000000000000 [ 0.774007] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 0.780427] CR2: ffff888035c01000 CR3: 0000000035a08000 CR4: 00000000000006b0 [ 0.788401] Call Trace: [ 0.791137] ? amd_iommu_prepare+0x15/0x2a [ 0.795717] apic_bsp_setup+0x55/0x75 [ 0.799808] apic_intr_mode_init+0x169/0x16e [ 0.804579] x86_late_time_init+0x10/0x17 [ 0.809062] start_kernel+0x37e/0x3fe [ 0.813154] x86_64_start_reservations+0x2a/0x2c [ 0.818316] x86_64_start_kernel+0x72/0x75 [ 0.822886] secondary_startup_64+0xa4/0xb0 [ 0.827564] ---[ end trace 237b64da0fd9b22e ]--- This change avoids these issues by only setting boot_cpu_physical_apicid from the MPS table if it is not already set, which can occur in the construct_default_ISA_mptable() path. Otherwise, boot_cpu_physical_apicid will already have been set in register_lapic_address() and should therefore remain untouched. Looking through all the places where boot_cpu_physical_apicid is accessed, nearly all of them assume that boot_cpu_physical_apicid should match read_apic_id() on the booting processor. The only place that might intend to use the BSP apicid listed in the MPS table is amd_numa_init(), which explicitly requires boot_cpu_physical_apicid to be the lowest apicid of all processors. Ironically, due to the early exit short circuit in early_get_smp_config(), it instead gets boot_cpu_physical_apicid = read_apic_id() rather than the MPS table BSP. The behaviour of amd_numa_init() is therefore unaffected by this change. Fixes: 3e730dad3b6da ("x86/apic: Unify interrupt mode setup for SMP-capable system") Signed-off-by: Kevin Mitchell <kevmitch(a)arista.com> Cc: <stable(a)vger.kernel.org> --- arch/x86/kernel/mpparse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index afac7ccce72f..6f22f09bfe11 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -64,7 +64,8 @@ static void __init MP_processor_info(struct mpc_cpu *m) if (m->cpuflag & CPU_BOOTPROCESSOR) { bootup_cpu = " (Bootup-CPU)"; - boot_cpu_physical_apicid = m->apicid; + if (boot_cpu_physical_apicid == -1U) + boot_cpu_physical_apicid = m->apicid; } pr_info("Processor #%d%s\n", m->apicid, bootup_cpu); -- 2.26.2

2 years, 7 months

1
1
0 0

[PATCH v3] drm/ast: Don't check new mode if CRTC is being disabled

by Thomas Zimmermann

Suspending failed because there's no mode if the CRTC is being disabled. Early-out in this case. This fixes runtime PM for ast. v3: * fixed commit message v2: * added Tested-by/Reported-by tags * added Fixes tags and CC (Sam) * improved comment Signed-off-by: Thomas Zimmermann <tzimmermann(a)suse.de> Reported-by: Cary Garrett <cogarre(a)gmail.com> Tested-by: Cary Garrett <cogarre(a)gmail.com> Fixes: b48e1b6ffd28 ("drm/ast: Add CRTC helpers for atomic modesetting") Cc: Thomas Zimmermann <tzimmermann(a)suse.de> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Dave Airlie <airlied(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: <stable(a)vger.kernel.org> # v5.6+ --- drivers/gpu/drm/ast/ast_mode.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 7a9f20a2fd303..0cbbb21edb4e1 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -801,6 +801,9 @@ static int ast_crtc_helper_atomic_check(struct drm_crtc *crtc, return -EINVAL; } + if (!state->enable) + return 0; /* no mode checks if CRTC is being disabled */ + ast_state = to_ast_crtc_state(state); format = ast_state->format; -- 2.26.0

2 years, 11 months

3
3
0 0

[PATCH v2 07/17] irqchip/gic: Atomically update affinity

by Marc Zyngier

The GIC driver uses a RMW sequence to update the affinity, and relies on the gic_lock_irqsave/gic_unlock_irqrestore sequences to update it atomically. But these sequences only expend into anything meaningful if the BL_SWITCHER option is selected, which almost never happens. It also turns out that using a RMW and locks is just as silly, as the GIC distributor supports byte accesses for the GICD_TARGETRn registers, which when used make the update atomic by definition. Drop the terminally broken code and replace it by a byte write. Fixes: 04c8b0f82c7d ("irqchip/gic: Make locking a BL_SWITCHER only feature") Cc: stable(a)vger.kernel.org Signed-off-by: Marc Zyngier <maz(a)kernel.org> --- drivers/irqchip/irq-gic.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 00de05abd3c3..c17fabd6741e 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -329,10 +329,8 @@ static int gic_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu) static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force) { - void __iomem *reg = gic_dist_base(d) + GIC_DIST_TARGET + (gic_irq(d) & ~3); - unsigned int cpu, shift = (gic_irq(d) % 4) * 8; - u32 val, mask, bit; - unsigned long flags; + void __iomem *reg = gic_dist_base(d) + GIC_DIST_TARGET + gic_irq(d); + unsigned int cpu; if (!force) cpu = cpumask_any_and(mask_val, cpu_online_mask); @@ -342,13 +340,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, if (cpu >= NR_GIC_CPU_IF || cpu >= nr_cpu_ids) return -EINVAL; - gic_lock_irqsave(flags); - mask = 0xff << shift; - bit = gic_cpu_map[cpu] << shift; - val = readl_relaxed(reg) & ~mask; - writel_relaxed(val | bit, reg); - gic_unlock_irqrestore(flags); - + writeb_relaxed(gic_cpu_map[cpu], reg); irq_data_update_effective_affinity(d, cpumask_of(cpu)); return IRQ_SET_MASK_OK_DONE; -- 2.27.0

3 years, 3 months

5
11
0 0

Re: [PATCH v2 11/12] mac80211: drop data frames without key on encrypted links

by Sasha Levin

Hi [This is an automated email] This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all The bot has tested the following trees: v5.5.11, v5.4.27, v4.19.112, v4.14.174, v4.9.217, v4.4.217. v5.5.11: Build OK! v5.4.27: Build OK! v4.19.112: Failed to apply! Possible dependencies: 03512ceb60ae ("ieee80211: remove redundant leading zeroes") 09b4a4faf9d0 ("mac80211: introduce capability flags for VHT EXT NSS support") 0eeb2b674f05 ("mac80211: add an option for station management TXQ") 1c9559734eca ("mac80211: remove unnecessary key condition") 57a3a454f303 ("iwlwifi: split HE capabilities between AP and STA") 62872a9b9a10 ("mac80211: Fix PTK rekey freezes and clear text leak") 77f7ffdc335d ("mac80211: minstrel_ht: add flag to indicate missing/inaccurate tx A-MPDU length") 77ff2c6b4984 ("mac80211: update HE IEs to D3.3") 80aaa9c16415 ("mac80211: Add he_capa debugfs entry") 96fc6efb9ad9 ("mac80211: IEEE 802.11 Extended Key ID support") add7453ad62f ("wireless: align to draft 11ax D3.0") adf8ed01e4fd ("mac80211: add an optional TXQ for other PS-buffered frames") caf56338c22f ("mac80211: indicate support for multiple BSSID") daa5b83513a7 ("mac80211: update HE operation fields to D3.0") v4.14.174: Failed to apply! Possible dependencies: 110b32f065f3 ("iwlwifi: mvm: rs: add basic implementation of the new RS API handlers") 1c73acf58bd6 ("iwlwifi: acpi: move ACPI method definitions to acpi.h") 28e9c00fe1f0 ("iwlwifi: remove upper case letters in sku_capa_band_*_enable") 4ae80f6c8d86 ("iwlwifi: support api ver2 of NVM_GET_INFO resp") 4b82455ca51e ("iwlwifi: use flags to denote modifiers for the channel maps") 4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c") 514c30696fbc ("iwlwifi: add support for IEEE802.11ax") 57a3a454f303 ("iwlwifi: split HE capabilities between AP and STA") 77ff2c6b4984 ("mac80211: update HE IEs to D3.3") 813df5cef3bb ("iwlwifi: acpi: add common code to read from ACPI") 8a6171a7b601 ("iwlwifi: fw: add FW APIs for HE") 9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common files") 9f66a397c877 ("iwlwifi: mvm: rs: add ops for the new rate scaling in the FW") e7a3b8d87910 ("iwlwifi: acpi: move ACPI-related definitions to acpi.h") v4.9.217: Failed to apply! Possible dependencies: 01796ff2fa6e ("iwlwifi: mvm: always free inactive queue when moving ownership") 0aaece81114e ("iwlwifi: split firmware API from iwl-trans.h") 1ea423b0e047 ("iwlwifi: remove unnecessary dev_cmd_headroom parameter") 310181ec34e2 ("iwlwifi: move to TVQM mode") 5594d80e9bf4 ("iwlwifi: support two phys for a000 devices") 623e7766be90 ("iwlwifi: pcie: introduce split point to a000 devices") 65e254821cee ("iwlwifi: mvm: use firmware station PM notification for AP_LINK_PS") 6b35ff91572f ("iwlwifi: pcie: introduce a000 TX queues management") 727c02dfb848 ("iwlwifi: pcie: cleanup rfkill checks") 77ff2c6b4984 ("mac80211: update HE IEs to D3.3") 8236f7db2724 ("iwlwifi: mvm: assign cab queue to the correct station") 87d0e1af9db3 ("iwlwifi: mvm: separate queue mapping from queue enablement") bb49701b41de ("iwlwifi: mvm: support a000 SCD queue configuration") cf90da352a32 ("iwlwifi: mvm: use mvm_disable_queue instead of sharing logic") d172a5eff629 ("iwlwifi: reorganize firmware API") df88c08d5c7e ("iwlwifi: mvm: release static queues on bcast release") eda50cde58de ("iwlwifi: pcie: add context information support") v4.4.217: Failed to apply! Possible dependencies: 0aaece81114e ("iwlwifi: split firmware API from iwl-trans.h") 13555e8ba2f4 ("iwlwifi: mvm: add 9000-series RX API") 1a616dd2f171 ("iwlwifi: dump prph registers in a common place for all transports") 1e0bbebaae66 ("mac80211: enable starting BA session with custom timeout") 2f89a5d7d377 ("iwlwifi: mvm: move fw-dbg code to separate file") 39bdb17ebb5b ("iwlwifi: update host command messages to new format") 41837ca962ec ("iwlwifi: pcie: allow to pretend to have Tx CSUM for debug") 4707fde5cdef ("iwlwifi: mvm: use build-time assertion for fw trigger ID") 5b88792cd850 ("iwlwifi: move to wide ID for all commands") 6c4fbcbc1c95 ("iwlwifi: add support for 12K Receive Buffers") 77ff2c6b4984 ("mac80211: update HE IEs to D3.3") 92fe83430b89 ("iwlwifi: uninline iwl_trans_send_cmd") d172a5eff629 ("iwlwifi: reorganize firmware API") dcbb4746286a ("iwlwifi: trans: support a callback for ASYNC commands") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks Sasha

3 years, 4 months

5
8
0 0

[PATCH 1/2] KVM: SVM: avoid infinite loop on NPF from bad address

by Paolo Bonzini

When a nested page fault is taken from an address that does not have a memslot associated to it, kvm_mmu_do_page_fault returns RET_PF_EMULATE (via mmu_set_spte) and kvm_mmu_page_fault then invokes svm_need_emulation_on_page_fault. The default answer there is to return false, but in this case this just causes the page fault to be retried ad libitum. Since this is not a fast path, and the only other case where it is taken is an erratum, just stick a kvm_vcpu_gfn_to_memslot check in there to detect the common case where the erratum is not happening. This fixes an infinite loop in the new set_memory_region_test. Fixes: 05d5a4863525 ("KVM: SVM: Workaround errata#1096 (insn_len maybe zero on SMAP violation)") Cc: stable(a)vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- arch/x86/kvm/svm/svm.c | 7 +++++++ virt/kvm/kvm_main.c | 1 + 2 files changed, 8 insertions(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index a91e397d6750..c86f7278509b 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3837,6 +3837,13 @@ static bool svm_need_emulation_on_page_fault(struct kvm_vcpu *vcpu) bool smap = cr4 & X86_CR4_SMAP; bool is_user = svm_get_cpl(vcpu) == 3; + /* + * If RIP is invalid, go ahead with emulation which will cause an + * internal error exit. + */ + if (!kvm_vcpu_gfn_to_memslot(vcpu, kvm_rip_read(vcpu) >> PAGE_SHIFT)) + return true; + /* * Detect and workaround Errata 1096 Fam_17h_00_0Fh. * diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index e2f60e313c87..e7436d054305 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1602,6 +1602,7 @@ struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn { return __gfn_to_memslot(kvm_vcpu_memslots(vcpu), gfn); } +EXPORT_SYMBOL_GPL(kvm_vcpu_gfn_to_memslot); bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn) { -- 2.18.2

3 years, 6 months

4
7
0 0

[PATCH] ARM: dts: at91: sama5d4: fix pinctrl muxing

by Ludovic Desroches

Fix pinctrl muxing, PD28, PD29 and PD31 can be muxed to peripheral A. It allows to use SCK0, SCK1 and SPI0_NPCS2 signals. Signed-off-by: Ludovic Desroches <ludovic.desroches(a)microchip.com> Fixes: 679f8d92bb01 ("ARM: at91/dt: sama5d4: add pioD pin mux mask and enable pioD") Cc: stable(a)vger.kernel.org --- arch/arm/boot/dts/sama5d4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index 6ab27a7b388d..a4cef07c38cb 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi @@ -914,7 +914,7 @@ /* A B C */ 0xffffffff 0x3ffcfe7c 0x1c010101 /* pioA */ 0x7fffffff 0xfffccc3a 0x3f00cc3a /* pioB */ 0xffffffff 0x3ff83fff 0xff00ffff /* pioC */ - 0x0003ff00 0x8002a800 0x00000000 /* pioD */ + 0xb003ff00 0x8002a800 0x00000000 /* pioD */ 0xffffffff 0x7fffffff 0x76fff1bf /* pioE */ >; -- 2.24.0.rc0

3 years, 6 months

3
2
0 0

FAILED: patch "[PATCH] erofs: fix extended inode could cross boundary" 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 0dcd3c94e02438f4a571690e26f4ee997524102a Mon Sep 17 00:00:00 2001 From: Gao Xiang <hsiangkao(a)redhat.com> Date: Thu, 30 Jul 2020 01:58:01 +0800 Subject: [PATCH] erofs: fix extended inode could cross boundary Each ondisk inode should be aligned with inode slot boundary (32-byte alignment) because of nid calculation formula, so all compact inodes (32 byte) cannot across page boundary. However, extended inode is now 64-byte form, which can across page boundary in principle if the location is specified on purpose, although it's hard to be generated by mkfs due to the allocation policy and rarely used by Android use case now mainly for > 4GiB files. For now, only two fields `i_ctime_nsec` and `i_nlink' couldn't be read from disk properly and cause out-of-bound memory read with random value. Let's fix now. Fixes: 431339ba9042 ("staging: erofs: add inode operations") Cc: <stable(a)vger.kernel.org> # 4.19+ Link: https://lore.kernel.org/r/20200729175801.GA23973@xiangao.remote.csb Reviewed-by: Chao Yu <yuchao0(a)huawei.com> Signed-off-by: Gao Xiang <hsiangkao(a)redhat.com> diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index 577fc9df4471..139d0bed42f8 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -8,31 +8,80 @@ #include <trace/events/erofs.h> -/* no locking */ -static int erofs_read_inode(struct inode *inode, void *data) +/* + * if inode is successfully read, return its inode page (or sometimes + * the inode payload page if it's an extended inode) in order to fill + * inline data if possible. + */ +static struct page *erofs_read_inode(struct inode *inode, + unsigned int *ofs) { + struct super_block *sb = inode->i_sb; + struct erofs_sb_info *sbi = EROFS_SB(sb); struct erofs_inode *vi = EROFS_I(inode); - struct erofs_inode_compact *dic = data; - struct erofs_inode_extended *die; + const erofs_off_t inode_loc = iloc(sbi, vi->nid); + + erofs_blk_t blkaddr, nblks = 0; + struct page *page; + struct erofs_inode_compact *dic; + struct erofs_inode_extended *die, *copied = NULL; + unsigned int ifmt; + int err; - const unsigned int ifmt = le16_to_cpu(dic->i_format); - struct erofs_sb_info *sbi = EROFS_SB(inode->i_sb); - erofs_blk_t nblks = 0; + blkaddr = erofs_blknr(inode_loc); + *ofs = erofs_blkoff(inode_loc); - vi->datalayout = erofs_inode_datalayout(ifmt); + erofs_dbg("%s, reading inode nid %llu at %u of blkaddr %u", + __func__, vi->nid, *ofs, blkaddr); + + page = erofs_get_meta_page(sb, blkaddr); + if (IS_ERR(page)) { + erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld", + vi->nid, PTR_ERR(page)); + return page; + } + dic = page_address(page) + *ofs; + ifmt = le16_to_cpu(dic->i_format); + + vi->datalayout = erofs_inode_datalayout(ifmt); if (vi->datalayout >= EROFS_INODE_DATALAYOUT_MAX) { erofs_err(inode->i_sb, "unsupported datalayout %u of nid %llu", vi->datalayout, vi->nid); - DBG_BUGON(1); - return -EOPNOTSUPP; + err = -EOPNOTSUPP; + goto err_out; } switch (erofs_inode_version(ifmt)) { case EROFS_INODE_LAYOUT_EXTENDED: - die = data; - vi->inode_isize = sizeof(struct erofs_inode_extended); + /* check if the inode acrosses page boundary */ + if (*ofs + vi->inode_isize <= PAGE_SIZE) { + *ofs += vi->inode_isize; + die = (struct erofs_inode_extended *)dic; + } else { + const unsigned int gotten = PAGE_SIZE - *ofs; + + copied = kmalloc(vi->inode_isize, GFP_NOFS); + if (!copied) { + err = -ENOMEM; + goto err_out; + } + memcpy(copied, dic, gotten); + unlock_page(page); + put_page(page); + + page = erofs_get_meta_page(sb, blkaddr + 1); + if (IS_ERR(page)) { + erofs_err(sb, "failed to get inode payload page (nid: %llu), err %ld", + vi->nid, PTR_ERR(page)); + kfree(copied); + return page; + } + *ofs = vi->inode_isize - gotten; + memcpy((u8 *)copied + gotten, page_address(page), *ofs); + die = copied; + } vi->xattr_isize = erofs_xattr_ibody_size(die->i_xattr_icount); inode->i_mode = le16_to_cpu(die->i_mode); @@ -69,9 +118,12 @@ static int erofs_read_inode(struct inode *inode, void *data) /* total blocks for compressed files */ if (erofs_inode_is_data_compressed(vi->datalayout)) nblks = le32_to_cpu(die->i_u.compressed_blocks); + + kfree(copied); break; case EROFS_INODE_LAYOUT_COMPACT: vi->inode_isize = sizeof(struct erofs_inode_compact); + *ofs += vi->inode_isize; vi->xattr_isize = erofs_xattr_ibody_size(dic->i_xattr_icount); inode->i_mode = le16_to_cpu(dic->i_mode); @@ -111,8 +163,8 @@ static int erofs_read_inode(struct inode *inode, void *data) erofs_err(inode->i_sb, "unsupported on-disk inode version %u of nid %llu", erofs_inode_version(ifmt), vi->nid); - DBG_BUGON(1); - return -EOPNOTSUPP; + err = -EOPNOTSUPP; + goto err_out; } if (!nblks) @@ -120,13 +172,18 @@ static int erofs_read_inode(struct inode *inode, void *data) inode->i_blocks = roundup(inode->i_size, EROFS_BLKSIZ) >> 9; else inode->i_blocks = nblks << LOG_SECTORS_PER_BLOCK; - return 0; + return page; bogusimode: erofs_err(inode->i_sb, "bogus i_mode (%o) @ nid %llu", inode->i_mode, vi->nid); + err = -EFSCORRUPTED; +err_out: DBG_BUGON(1); - return -EFSCORRUPTED; + kfree(copied); + unlock_page(page); + put_page(page); + return ERR_PTR(err); } static int erofs_fill_symlink(struct inode *inode, void *data, @@ -146,7 +203,7 @@ static int erofs_fill_symlink(struct inode *inode, void *data, if (!lnk) return -ENOMEM; - m_pofs += vi->inode_isize + vi->xattr_isize; + m_pofs += vi->xattr_isize; /* inline symlink data shouldn't cross page boundary as well */ if (m_pofs + inode->i_size > PAGE_SIZE) { kfree(lnk); @@ -167,37 +224,17 @@ static int erofs_fill_symlink(struct inode *inode, void *data, static int erofs_fill_inode(struct inode *inode, int isdir) { - struct super_block *sb = inode->i_sb; struct erofs_inode *vi = EROFS_I(inode); struct page *page; - void *data; - int err; - erofs_blk_t blkaddr; unsigned int ofs; - erofs_off_t inode_loc; + int err = 0; trace_erofs_fill_inode(inode, isdir); - inode_loc = iloc(EROFS_SB(sb), vi->nid); - blkaddr = erofs_blknr(inode_loc); - ofs = erofs_blkoff(inode_loc); - - erofs_dbg("%s, reading inode nid %llu at %u of blkaddr %u", - __func__, vi->nid, ofs, blkaddr); - page = erofs_get_meta_page(sb, blkaddr); - - if (IS_ERR(page)) { - erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld", - vi->nid, PTR_ERR(page)); + /* read inode base data from disk */ + page = erofs_read_inode(inode, &ofs); + if (IS_ERR(page)) return PTR_ERR(page); - } - - DBG_BUGON(!PageUptodate(page)); - data = page_address(page); - - err = erofs_read_inode(inode, data + ofs); - if (err) - goto out_unlock; /* setup the new inode */ switch (inode->i_mode & S_IFMT) { @@ -210,7 +247,7 @@ static int erofs_fill_inode(struct inode *inode, int isdir) inode->i_fop = &erofs_dir_fops; break; case S_IFLNK: - err = erofs_fill_symlink(inode, data, ofs); + err = erofs_fill_symlink(inode, page_address(page), ofs); if (err) goto out_unlock; inode_nohighmem(inode);

3 years, 8 months

3
7
0 0

[PATCH 4.9 000/128] 4.9.228-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.228 release. There are 128 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun, 21 Jun 2020 14:15:50 +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.9.228-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.9.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.9.228-rc1 Adrian Hunter <adrian.hunter(a)intel.com> perf symbols: Fix debuginfo search for Ubuntu Masami Hiramatsu <mhiramat(a)kernel.org> perf probe: Do not show the skipped events H. Nikolaus Schaller <hns(a)goldelico.com> w1: omap-hdq: cleanup to add missing newline for some dev_dbg Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: pasemi: Fix the probe error path Álvaro Fernández Rojas <noltari(a)gmail.com> mtd: rawnand: brcmnand: fix hamming oob layout NeilBrown <neilb(a)suse.de> sunrpc: clean up properly in gss_mech_unregister() NeilBrown <neilb(a)suse.de> sunrpc: svcauth_gss_register_pseudoflavor must reject duplicate registrations. Masahiro Yamada <masahiroy(a)kernel.org> kbuild: force to build vmlinux if CONFIG_MODVERSION=y Michael Ellerman <mpe(a)ellerman.id.au> drivers/macintosh: Fix memleak in windfarm_pm112 driver Dmitry Osipenko <digetx(a)gmail.com> ARM: tegra: Correct PL310 Auxiliary Control Register initialization Douglas Anderson <dianders(a)chromium.org> kernel/cpu_pm: Fix uninitted local in cpu_pm Al Viro <viro(a)zeniv.linux.org.uk> sparc64: fix misuses of access_process_vm() in genregs32_[sg]et() Al Viro <viro(a)zeniv.linux.org.uk> sparc32: fix register window handling in genregs32_[gs]et() Jonathan Bakker <xc-racer2(a)live.ca> pinctrl: samsung: Save/restore eint_mask over suspend for EINT_TYPE GPIOs Anders Roxell <anders.roxell(a)linaro.org> power: vexpress: add suppress_bind_attrs to true Kai-Heng Feng <kai.heng.feng(a)canonical.com> igb: Report speed and duplex as unknown when device is runtime suspended Larry Finger <Larry.Finger(a)lwfinger.net> b43_legacy: Fix connection problem with WPA3 Larry Finger <Larry.Finger(a)lwfinger.net> b43: Fix connection problem with WPA3 Larry Finger <Larry.Finger(a)lwfinger.net> b43legacy: Fix case where channel status is corrupted Chuhong Yuan <hslester96(a)gmail.com> media: go7007: fix a miss of snd_card_free Christian Lamparter <chunkeey(a)gmail.com> carl9170: remove P2P_GO support Punit Agrawal <punit1.agrawal(a)toshiba.co.jp> e1000e: Relax condition to trigger reset for ME workaround Ashok Raj <ashok.raj(a)intel.com> PCI: Program MPS for RCiEP devices Giuliano Procida <gprocida(a)google.com> blk-mq: move blk_mq_update_nr_hw_queues synchronize_rcu call Omar Sandoval <osandov(a)fb.com> btrfs: fix error handling when submitting direct I/O bio Eric Biggers <ebiggers(a)google.com> ext4: fix race between ext4_sync_parent() and rename() Harshad Shirwadkar <harshadshirwadkar(a)gmail.com> ext4: fix EXT_MAX_EXTENT/INDEX to check for zeroed eh_max Roberto Sassu <roberto.sassu(a)huawei.com> evm: Fix possible memory leak in evm_calc_hmac_or_hash() Roberto Sassu <roberto.sassu(a)huawei.com> ima: Directly assign the ima_default_policy pointer to ima_rules Krzysztof Struczynski <krzysztof.struczynski(a)huawei.com> ima: Fix ima digest hash table key calculation Andrea Arcangeli <aarcange(a)redhat.com> mm: thp: make the THP mapcount atomic against __split_huge_pmd_locked() Marcos Paulo de Souza <mpdesouza(a)suse.com> btrfs: send: emit file capabilities after chown Qiushi Wu <wu000273(a)umn.edu> cpuidle: Fix three reference count leaks Serge Semin <Sergey.Semin(a)baikalelectronics.ru> spi: dw: Return any value retrieved from the dma_transfer callback Haibo Chen <haibo.chen(a)nxp.com> mmc: sdhci-esdhc-imx: fix the mask for tuning start point Xie XiuQi <xiexiuqi(a)huawei.com> ixgbe: fix signed-integer-overflow warning Ulf Hansson <ulf.hansson(a)linaro.org> staging: greybus: sdio: Respect the cmd->busy_timeout from the mmc core YuanJunQing <yuanjunqing66(a)163.com> MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe() Jiaxun Yang <jiaxun.yang(a)flygoat.com> PCI: Don't disable decoding when mmio_always_on is set Alexander Sverdlin <alexander.sverdlin(a)nokia.com> macvlan: Skip loopback packets in RX handler Finn Thain <fthain(a)telegraphics.com.au> m68k: mac: Don't call via_flush_cache() on Mac IIfx Arvind Sankar <nivedita(a)alum.mit.edu> x86/mm: Stop printing BRK addresses Serge Semin <Sergey.Semin(a)baikalelectronics.ru> mips: Add udelay lpj numbers adjustment Arvind Sankar <nivedita(a)alum.mit.edu> x86/boot: Correct relocation destination on old linkers Pali Rohár <pali(a)kernel.org> mwifiex: Fix memory corruption in dump_station Dan Carpenter <dan.carpenter(a)oracle.com> rtlwifi: Fix a double free in _rtl_usb_tx_urb_setup() Guoqing Jiang <guoqing.jiang(a)cloud.ionos.com> md: don't flush workqueue unconditionally in md_open Daniel Thompson <daniel.thompson(a)linaro.org> kgdb: Fix spurious true from in_dbg_master() Serge Semin <Sergey.Semin(a)baikalelectronics.ru> mips: cm: Fix an invalid error code of INTVN_*_ERR Jiaxun Yang <jiaxun.yang(a)flygoat.com> MIPS: Truncate link address into 32bit for 32bit kernel Jeremy Kerr <jk(a)ozlabs.org> powerpc/spufs: fix copy_to_user while atomic Yunjian Wang <wangyunjian(a)huawei.com> net: allwinner: Fix use correct return type for ndo_start_xmit() Wei Yongjun <weiyongjun1(a)huawei.com> net: lpc-enet: fix error return code in lpc_mii_init() Jann Horn <jannh(a)google.com> exit: Move preemption fixup up, move blocking operations down Nathan Chancellor <natechancellor(a)gmail.com> lib/mpi: Fix 64-bit MIPS build with Clang Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_nat: return EOPNOTSUPP if type or flags are not supported Tiezhu Yang <yangtiezhu(a)loongson.cn> MIPS: Make sparse_init() using top-down allocation Kieran Bingham <kieran.bingham+renesas(a)ideasonboard.com> media: platform: fcp: Set appropriate DMA parameters Colin Ian King <colin.king(a)canonical.com> media: dvb: return -EREMOTEIO on i2c transfer failure. Jitao Shi <jitao.shi(a)mediatek.com> dt-bindings: display: mediatek: control dpi pins mode to avoid leakage Kees Cook <keescook(a)chromium.org> e1000: Distribute switch variables for initialization Christoph Hellwig <hch(a)lst.de> staging: android: ion: use vmap instead of vm_map_ram Jia-Ju Bai <baijiaju1990(a)gmail.com> net: vmxnet3: fix possible buffer overflow caused by bad DMA value in vmxnet3_get_rss() Jon Doron <arilou(a)gmail.com> x86/kvm/hyper-v: Explicitly align hcall param for kvm_hyperv_exit Linus Walleij <linus.walleij(a)linaro.org> ARM: 8978/1: mm: make act_mm() respect THREAD_SIZE Filipe Manana <fdmanana(a)suse.com> btrfs: do not ignore error from btrfs_next_leaf() when inserting checksums Serge Semin <Sergey.Semin(a)baikalelectronics.ru> clocksource: dw_apb_timer_of: Fix missing clockevent timers Serge Semin <Sergey.Semin(a)baikalelectronics.ru> spi: dw: Enable interrupts in accordance with DMA xfer mode Douglas Anderson <dianders(a)chromium.org> kgdb: Prevent infinite recursive entries to the debugger Hsin-Yu Chao <hychao(a)chromium.org> Bluetooth: Add SCO fallback for invalid LMP parameters error Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> spi: dw: Zero DMA Tx and Rx configurations on stack Arthur Kiyanovski <akiyano(a)amazon.com> net: ena: fix error returning in ena_com_get_hash_function() Julien Thierry <jthierry(a)redhat.com> objtool: Ignore empty alternatives Brad Love <brad(a)nextdimension.cc> media: si2157: Better check for running tuner in init Ard Biesheuvel <ardb(a)kernel.org> ACPI: GED: use correct trigger type field in _Exx / _Lxx handling Colin Ian King <colin.king(a)canonical.com> media: dvb_frontend: ensure that inital front end status initialized Xiaolong Huang <butterflyhuangxx(a)gmail.com> can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices Chris Wilson <chris(a)chris-wilson.co.uk> agp/intel: Reinforce the barrier after GTT updates Barret Rhoden <brho(a)google.com> perf: Add cond_resched() to task_function_call() OGAWA Hirofumi <hirofumi(a)mail.parknet.co.jp> fat: don't allow to mount if the FAT length == 0 Wang Hai <wanghai38(a)huawei.com> mm/slub: fix a memory leak in sysfs_slab_add() Casey Schaufler <casey(a)schaufler-ca.com> Smack: slab-out-of-bounds in vsscanf Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb Qiujun Huang <hqjagain(a)gmail.com> ath9x: Fix stack-out-of-bounds Write in ath9k_hif_usb_rx_cb Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix use-after-free Write in ath9k_htc_rx_msg Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix use-after-free Read in ath9k_wmi_ctrl_rx Marc Zyngier <maz(a)kernel.org> KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts Xing Li <lixing(a)loongson.cn> KVM: MIPS: Fix VPN2_MASK definition for variable cpu_vmbits Xing Li <lixing(a)loongson.cn> KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data) Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: nVMX: Consult only the "basic" exit reason when routing nested exit Paolo Bonzini <pbonzini(a)redhat.com> KVM: nSVM: leave ASID aside in copy_vmcb_control_area Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> video: fbdev: w100fb: Fix a potential double free. Eric W. Biederman <ebiederm(a)xmission.com> proc: Use new_inode not new_inode_pseudo Yuxuan Shui <yshuiv7(a)gmail.com> ovl: initialize error in ovl_copy_xattr Lukas Wunner <lukas(a)wunner.de> spi: bcm2835: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: pxa2xx: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: Fix controller unregister order Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> spi: No need to assign dummy value in spi_unregister_controller() Lukas Wunner <lukas(a)wunner.de> spi: dw: Fix controller unregister order Sasha Levin <sashal(a)kernel.org> spi: dw: fix possible race condition Anthony Steinhauser <asteinhauser(a)google.com> x86/speculation: PR_SPEC_FORCE_DISABLE enforcement for indirect branches. Anthony Steinhauser <asteinhauser(a)google.com> x86/speculation: Avoid force-disabling IBPB based on STIBP and enhanced IBRS. Thomas Lendacky <Thomas.Lendacky(a)amd.com> x86/speculation: Add support for STIBP always-on preferred mode Waiman Long <longman(a)redhat.com> x86/speculation: Change misspelled STIPB to STIBP Michał Mirosław <mirq-linux(a)rere.qmqm.pl> ALSA: pcm: disallow linking stream to itself Justin Chen <justinpopo6(a)gmail.com> spi: bcm-qspi: when tx/rx buffer is NULL set to 0 Lukas Wunner <lukas(a)wunner.de> spi: bcm2835aux: Fix controller unregister order Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix null pointer dereference at nilfs_segctor_do_construct() Tejun Heo <tj(a)kernel.org> cgroup, blkcg: Prepare some symbols for module and !CONFIG_CGROUP usages Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI: PM: Avoid using power resources if there are none for D0 Ard Biesheuvel <ardb(a)kernel.org> ACPI: GED: add support for _Exx / _Lxx handler methods Qiushi Wu <wu000273(a)umn.edu> ACPI: CPPC: Fix reference count leak in acpi_cppc_processor_probe() Qiushi Wu <wu000273(a)umn.edu> ACPI: sysfs: Fix reference count leak in acpi_sysfs_add_hotplug_profile() Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix inconsistent card PM state after resume Chuhong Yuan <hslester96(a)gmail.com> ALSA: es1688: Add the missed snd_card_free() Ard Biesheuvel <ardb(a)kernel.org> efi/efivars: Add missing kobject_put() in sysfs entry creation error path Hill Ma <maahiuzeon(a)gmail.com> x86/reboot/quirks: Add MacBook6,1 reboot quirk Anthony Steinhauser <asteinhauser(a)google.com> x86/speculation: Prevent rogue cross-process SSBD shutdown Xiaochun Lee <lixc17(a)lenovo.com> x86/PCI: Mark Intel C620 MROMs as having non-compliant BARs Bob Haarman <inglorion(a)google.com> x86_64: Fix jiffies ODR violation Masashi Honma <masashi.honma(a)gmail.com> ath9k_htc: Silence undersized packet warnings Thomas Falcon <tlfalcon(a)linux.ibm.com> drivers/net/ibmvnic: Update VNIC protocol version reporting Jens Axboe <axboe(a)kernel.dk> sched/fair: Don't NUMA balance for kthreads Fredrik Strupe <fredrik(a)strupe.net> ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook Su Kang Yin <cantona(a)cantona.net> crypto: talitos - fix ECB and CBC algs ivsize Johannes Thumshirn <jthumshirn(a)suse.de> scsi: return correct blkprep status code in case scsi_init_io() fails. Ido Schimmel <idosch(a)mellanox.com> vxlan: Avoid infinite loop when suppressing NS messages with invalid options Hangbin Liu <liuhangbin(a)gmail.com> ipv6: fix IPV6_ADDRFORM operation logic ------------- Diffstat: .../bindings/display/mediatek/mediatek,dpi.txt | 6 + Documentation/virtual/kvm/api.txt | 2 + Makefile | 17 +- arch/arm/kernel/ptrace.c | 4 +- arch/arm/mach-tegra/tegra.c | 4 +- arch/arm/mm/proc-macros.S | 3 +- arch/arm64/include/asm/kvm_host.h | 6 +- arch/m68k/include/asm/mac_via.h | 1 + arch/m68k/mac/config.c | 21 +- arch/m68k/mac/via.c | 6 +- arch/mips/Makefile | 13 +- arch/mips/boot/compressed/Makefile | 2 +- arch/mips/include/asm/kvm_host.h | 6 +- arch/mips/kernel/genex.S | 6 +- arch/mips/kernel/mips-cm.c | 6 +- arch/mips/kernel/setup.c | 10 + arch/mips/kernel/time.c | 70 +++++++ arch/mips/kernel/vmlinux.lds.S | 2 +- arch/powerpc/platforms/cell/spufs/file.c | 113 ++++++---- arch/sparc/kernel/ptrace_32.c | 228 +++++++++------------ arch/sparc/kernel/ptrace_64.c | 17 +- arch/x86/boot/compressed/head_32.S | 5 +- arch/x86/boot/compressed/head_64.S | 1 + arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/nospec-branch.h | 1 + arch/x86/kernel/cpu/bugs.c | 94 ++++++--- arch/x86/kernel/process.c | 28 +-- arch/x86/kernel/process.h | 2 +- arch/x86/kernel/reboot.c | 8 + arch/x86/kernel/time.c | 4 - arch/x86/kernel/vmlinux.lds.S | 4 +- arch/x86/kvm/svm.c | 2 +- arch/x86/kvm/vmx.c | 2 +- arch/x86/mm/init.c | 2 - arch/x86/pci/fixup.c | 4 + block/blk-mq.c | 8 +- drivers/acpi/cppc_acpi.c | 4 +- drivers/acpi/device_pm.c | 2 +- drivers/acpi/evged.c | 22 +- drivers/acpi/scan.c | 28 ++- drivers/acpi/sysfs.c | 4 +- drivers/char/agp/intel-gtt.c | 4 +- drivers/clocksource/dw_apb_timer_of.c | 6 +- drivers/cpuidle/sysfs.c | 6 +- drivers/crypto/talitos.c | 2 +- drivers/firmware/efi/efivars.c | 4 +- drivers/macintosh/windfarm_pm112.c | 21 +- drivers/md/md.c | 3 +- drivers/media/dvb-core/dvb_frontend.c | 2 +- drivers/media/platform/rcar-fcp.c | 5 + drivers/media/tuners/si2157.c | 15 +- drivers/media/usb/dvb-usb/dibusb-mb.c | 2 +- drivers/media/usb/go7007/snd-go7007.c | 35 ++-- drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- drivers/mtd/nand/brcmnand/brcmnand.c | 11 +- drivers/mtd/nand/pasemi_nand.c | 4 +- drivers/net/can/usb/kvaser_usb.c | 6 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- drivers/net/ethernet/amazon/ena/ena_com.c | 6 +- drivers/net/ethernet/ibm/ibmvnic.c | 8 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- drivers/net/ethernet/intel/e1000e/e1000.h | 1 - drivers/net/ethernet/intel/e1000e/netdev.c | 12 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- drivers/net/ethernet/nxp/lpc_eth.c | 3 +- drivers/net/macvlan.c | 4 + drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 + drivers/net/vxlan.c | 4 + drivers/net/wireless/ath/ath9k/hif_usb.c | 58 ++++-- drivers/net/wireless/ath/ath9k/hif_usb.h | 6 + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 10 +- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 6 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 3 + drivers/net/wireless/ath/ath9k/wmi.c | 5 +- drivers/net/wireless/ath/ath9k/wmi.h | 3 +- drivers/net/wireless/ath/carl9170/fw.c | 4 +- drivers/net/wireless/ath/carl9170/main.c | 21 +- drivers/net/wireless/broadcom/b43/main.c | 2 +- drivers/net/wireless/broadcom/b43legacy/main.c | 1 + drivers/net/wireless/broadcom/b43legacy/xmit.c | 1 + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 14 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 8 +- drivers/pci/probe.c | 24 ++- drivers/pinctrl/samsung/pinctrl-exynos.c | 9 + drivers/power/reset/vexpress-poweroff.c | 1 + drivers/scsi/scsi_lib.c | 4 +- drivers/spi/spi-bcm-qspi.c | 8 +- drivers/spi/spi-bcm2835.c | 4 +- drivers/spi/spi-bcm2835aux.c | 4 +- drivers/spi/spi-dw-mid.c | 16 +- drivers/spi/spi-dw.c | 14 +- drivers/spi/spi-pxa2xx.c | 4 +- drivers/spi/spi.c | 5 +- drivers/staging/android/ion/ion_heap.c | 4 +- drivers/staging/greybus/sdio.c | 10 +- drivers/video/fbdev/w100fb.c | 2 + drivers/w1/masters/omap_hdq.c | 10 +- fs/btrfs/file-item.c | 6 +- fs/btrfs/inode.c | 6 +- fs/btrfs/send.c | 67 ++++++ fs/ext4/ext4_extents.h | 9 +- fs/ext4/fsync.c | 28 ++- fs/fat/inode.c | 6 + fs/fs-writeback.c | 1 + fs/nilfs2/segment.c | 2 + fs/overlayfs/copy_up.c | 2 +- fs/proc/inode.c | 2 +- fs/proc/self.c | 2 +- fs/proc/thread_self.c | 2 +- include/linux/kgdb.h | 2 +- include/linux/sunrpc/gss_api.h | 1 + include/linux/sunrpc/svcauth_gss.h | 3 +- include/uapi/linux/dvb/frontend.h | 1 + include/uapi/linux/kvm.h | 2 + kernel/cpu_pm.c | 4 +- kernel/debug/debug_core.c | 1 + kernel/events/core.c | 23 ++- kernel/exit.c | 25 ++- kernel/sched/fair.c | 2 +- lib/mpi/longlong.h | 2 +- mm/huge_memory.c | 31 ++- mm/slub.c | 4 +- net/bluetooth/hci_event.c | 1 + net/ipv6/ipv6_sockglue.c | 13 +- net/netfilter/nft_nat.c | 4 +- net/sunrpc/auth_gss/gss_mech_switch.c | 12 +- net/sunrpc/auth_gss/svcauth_gss.c | 18 +- security/integrity/evm/evm_crypto.c | 2 +- security/integrity/ima/ima.h | 7 +- security/integrity/ima/ima_policy.c | 3 +- security/smack/smackfs.c | 10 + sound/core/pcm_native.c | 5 + sound/isa/es1688/es1688.c | 4 +- sound/usb/card.c | 20 +- sound/usb/usbaudio.h | 2 +- tools/objtool/check.c | 6 + tools/perf/builtin-probe.c | 3 + tools/perf/util/dso.c | 16 ++ tools/perf/util/dso.h | 1 + tools/perf/util/probe-finder.c | 1 + tools/perf/util/symbol.c | 2 + 142 files changed, 1010 insertions(+), 566 deletions(-)

3 years, 10 months

6
134
0 0

[PATCH] drm/rockchip: Require the YTR modifier for AFBC

by Alyssa Rosenzweig

The AFBC decoder used in the Rockchip VOP assumes the use of the YUV-like colourspace transform (YTR). YTR is lossless for RGB(A) buffers, which covers the RGBA8 and RGB565 formats supported in vop_convert_afbc_format. Use of YTR is signaled with the AFBC_FORMAT_MOD_YTR modifier, which prior to this commit was missing. As such, a producer would have to generate buffers that do not use YTR, which the VOP would erroneously decode as YTR, leading to severe visual corruption. The upstream AFBC support was developed against a captured frame, which failed to exercise modifier support. Prior to bring-up of AFBC in Mesa (in the Panfrost driver), no open userspace respected modifier reporting. As such, this change is not expected to affect broken userspaces. Tested on RK3399 with Panfrost and Weston. Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig(a)collabora.com> --- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 4a2099cb5..857d97cdc 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -17,9 +17,20 @@ #define NUM_YUV2YUV_COEFFICIENTS 12 +/* AFBC supports a number of configurable modes. Relevant to us is block size + * (16x16 or 32x8), storage modifiers (SPARSE, SPLIT), and the YUV-like + * colourspace transform (YTR). 16x16 SPARSE mode is always used. SPLIT mode + * could be enabled via the hreg_block_split register, but is not currently + * handled. The colourspace transform is implicitly always assumed by the + * decoder, so consumers must use this transform as well. + * + * Failure to match modifiers will cause errors displaying AFBC buffers + * produced by conformant AFBC producers, including Mesa. + */ #define ROCKCHIP_AFBC_MOD \ DRM_FORMAT_MOD_ARM_AFBC( \ AFBC_FORMAT_MOD_BLOCK_SIZE_16x16 | AFBC_FORMAT_MOD_SPARSE \ + | AFBC_FORMAT_MOD_YTR \ ) enum vop_data_format { -- 2.28.0

3 years, 10 months

5
4
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2020