October 2020 - Linux-stable-mirror

[PATCH v3 1/2] mm/compaction: count pages and stop correctly during page isolation.

by Zi Yan

From: Zi Yan <ziy(a)nvidia.com> In isolate_migratepages_block, when cc->alloc_contig is true, we are able to isolate compound pages, nr_migratepages and nr_isolated did not count compound pages correctly, causing us to isolate more pages than we thought. Count compound pages as the number of base pages they contain. Otherwise, we might be trapped in too_many_isolated while loop, since the actual isolated pages can go up to COMPACT_CLUSTER_MAX*512=16384, where COMPACT_CLUSTER_MAX is 32, since we stop isolation after cc->nr_migratepages reaches to COMPACT_CLUSTER_MAX. In addition, after we fix the issue above, cc->nr_migratepages could never be equal to COMPACT_CLUSTER_MAX if compound pages are isolated, thus page isolation could not stop as we intended. Change the isolation stop condition to >=. The issue can be triggered as follows: In a system with 16GB memory and an 8GB CMA region reserved by hugetlb_cma, if we first allocate 10GB THPs and mlock them (so some THPs are allocated in the CMA region and mlocked), reserving 6 1GB hugetlb pages via /sys/kernel/mm/hugepages/hugepages-1048576kB/nr_hugepages will get stuck (looping in too_many_isolated function) until we kill either task. With the patch applied, oom will kill the application with 10GB THPs and let hugetlb page reservation finish. Fixes: 1da2f328fa64 (“mm,thp,compaction,cma: allow THP migration for CMA allocations”) Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Yang Shi <shy828301(a)gmail.com> Cc: <stable(a)vger.kernel.org> --- mm/compaction.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index ee1f8439369e..3e834ac402f1 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1012,8 +1012,8 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, isolate_success: list_add(&page->lru, &cc->migratepages); - cc->nr_migratepages++; - nr_isolated++; + cc->nr_migratepages += compound_nr(page); + nr_isolated += compound_nr(page); /* * Avoid isolating too much unless this block is being @@ -1021,7 +1021,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, * or a lock is contended. For contention, isolate quickly to * potentially remove one source of contention. */ - if (cc->nr_migratepages == COMPACT_CLUSTER_MAX && + if (cc->nr_migratepages >= COMPACT_CLUSTER_MAX && !cc->rescan && !cc->contended) { ++low_pfn; break; @@ -1132,7 +1132,7 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn, if (!pfn) break; - if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) + if (cc->nr_migratepages >= COMPACT_CLUSTER_MAX) break; } -- 2.28.0

4 years, 2 months

2
3
0 0

[PATCH 5.4 00/48] 5.4.74-rc2 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.74 release. There are 48 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 Mon, 02 Nov 2020 11:42:20 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.74-rc2… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.74-rc2 Pali Rohár <pali(a)kernel.org> phy: marvell: comphy: Convert internal SMCC firmware return codes to errno Ricky Wu <ricky_wu(a)realtek.com> misc: rtsx: do not setting OC_POWER_DOWN reg in rtsx_pci_init_ocp() Stafford Horne <shorne(a)gmail.com> openrisc: Fix issue with get_user for 64-bit values Arnd Bergmann <arnd(a)arndb.de> crypto: x86/crc32c - fix building with clang ias Souptick Joarder <jrdr.linux(a)gmail.com> xen/gntdev.c: Mark pages as dirty Geert Uytterhoeven <geert+renesas(a)glider.be> ata: sata_rcar: Fix DMA boundary mask Grygorii Strashko <grygorii.strashko(a)ti.com> PM: runtime: Fix timer_expires data type on 32-bit arches Peter Zijlstra <peterz(a)infradead.org> serial: pl011: Fix lockdep splat when handling magic-sysrq interrupt Paras Sharma <parashar(a)codeaurora.org> serial: qcom_geni_serial: To correct QUP Version detection logic Gustavo A. R. Silva <gustavo(a)embeddedor.com> mtd: lpddr: Fix bad logic in print_drs_error Jason Gunthorpe <jgg(a)nvidia.com> RDMA/addr: Fix race with netevent_callback()/rdma_addr_cancel() Frederic Barrat <fbarrat(a)linux.ibm.com> cxl: Rework error message for incompatible slots Jia-Ju Bai <baijiaju(a)tsinghua.edu.cn> p54: avoid accessing the data mapped to streaming DMA Roberto Sassu <roberto.sassu(a)huawei.com> evm: Check size of security.evm before using it Song Liu <songliubraving(a)fb.com> bpf: Fix comment for helper bpf_current_task_under_cgroup() Miklos Szeredi <mszeredi(a)redhat.com> fuse: fix page dereference after free Pali Rohár <pali(a)kernel.org> ata: ahci: mvebu: Make SATA PHY optional for Armada 3720 Juergen Gross <jgross(a)suse.com> x86/xen: disable Firmware First mode for correctable memory errors Kim Phillips <kim.phillips(a)amd.com> arch/x86/amd/ibs: Fix re-arming IBS Fetch Gao Xiang <hsiangkao(a)redhat.com> erofs: avoid duplicated permission check for "trusted." xattrs Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Invoke cancel_delayed_work_sync() for PFs also. Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Fix regression in workqueue cleanup logic in bnxt_remove_one(). Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Re-write PCI BARs after PCI fatal error. Zenghui Yu <yuzenghui(a)huawei.com> net: hns3: Clear the CMDQ registers before unmapping BAR region Tung Nguyen <tung.q.nguyen(a)dektech.com.au> tipc: fix memory leak caused by tipc_buf_append() Arjun Roy <arjunroy(a)google.com> tcp: Prevent low rmem stalls with SO_RCVLOWAT. Andrew Gabbasov <andrew_gabbasov(a)mentor.com> ravb: Fix bit fields checking in ravb_hwtstamp_get() Heiner Kallweit <hkallweit1(a)gmail.com> r8169: fix issue with forced threading in combination with shared interrupts Guillaume Nault <gnault(a)redhat.com> net/sched: act_mpls: Add softdep on mpls_gso.ko Aleksandr Nogikh <nogikh(a)google.com> netem: fix zero division in tabledist Ido Schimmel <idosch(a)nvidia.com> mlxsw: core: Fix memory leak on module removal Lijun Pan <ljp(a)linux.ibm.com> ibmvnic: fix ibmvnic_set_mac Masahiro Fujiwara <fujiwara.masahiro(a)gmail.com> gtp: fix an use-before-init in gtp_newlink() Raju Rangoju <rajur(a)chelsio.com> cxgb4: set up filter action after rewrites Vinay Kumar Yadav <vinay.yadav(a)chelsio.com> chelsio/chtls: fix tls record info to user Vinay Kumar Yadav <vinay.yadav(a)chelsio.com> chelsio/chtls: fix memory leaks in CPL handlers Vinay Kumar Yadav <vinay.yadav(a)chelsio.com> chelsio/chtls: fix deadlock issue Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Send HWRM_FUNC_RESET fw command unconditionally. Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Check abort error state in bnxt_open_nic(). Michael Schaller <misch(a)google.com> efivarfs: Replace invalid slashes with exclamation marks in dentries. Randy Dunlap <rdunlap(a)infradead.org> x86/PCI: Fix intel_mid_pci.c build error when ACPI is not enabled Nick Desaulniers <ndesaulniers(a)google.com> arm64: link with -z norelro regardless of CONFIG_RELOCATABLE Marc Zyngier <maz(a)kernel.org> arm64: Run ARCH_WORKAROUND_2 enabling code on all CPUs Marc Zyngier <maz(a)kernel.org> arm64: Run ARCH_WORKAROUND_1 enabling code on all CPUs Rasmus Villemoes <linux(a)rasmusvillemoes.dk> scripts/setlocalversion: make git describe output more reliable Josh Poimboeuf <jpoimboe(a)redhat.com> objtool: Support Clang non-section symbols in ORC generation Christian Eggers <ceggers(a)arri.de> socket: don't clear SOCK_TSTAMP_NEW when SO_TIMESTAMPNS is disabled Saeed Mirzamohammadi <saeed.mirzamohammadi(a)oracle.com> netfilter: nftables_offload: KASAN slab-out-of-bounds Read in nft_flow_rule_create ------------- Diffstat: Makefile | 4 +- arch/arm64/Makefile | 4 +- arch/arm64/kernel/cpu_errata.c | 15 ++++++ arch/openrisc/include/asm/uaccess.h | 35 +++++++++----- arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +- arch/x86/events/amd/ibs.c | 15 +++++- arch/x86/pci/intel_mid_pci.c | 1 + arch/x86/xen/enlighten_pv.c | 9 ++++ drivers/ata/ahci.h | 2 + drivers/ata/ahci_mvebu.c | 2 +- drivers/ata/libahci_platform.c | 2 +- drivers/ata/sata_rcar.c | 2 +- drivers/crypto/chelsio/chtls/chtls_cm.c | 29 +++++------ drivers/crypto/chelsio/chtls/chtls_io.c | 7 ++- drivers/infiniband/core/addr.c | 11 ++--- drivers/misc/cardreader/rtsx_pcr.c | 4 -- drivers/misc/cxl/pci.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 45 ++++++++++------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 56 +++++++++++----------- drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h | 4 ++ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 8 +++- drivers/net/ethernet/mellanox/mlxsw/core.c | 2 + drivers/net/ethernet/realtek/r8169_main.c | 4 +- drivers/net/ethernet/renesas/ravb_main.c | 10 ++-- drivers/net/gtp.c | 16 +++---- drivers/net/wireless/intersil/p54/p54pci.c | 4 +- drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 14 ++++-- drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 14 ++++-- drivers/tty/serial/amba-pl011.c | 11 +++-- drivers/tty/serial/qcom_geni_serial.c | 2 +- drivers/xen/gntdev.c | 17 +++++-- fs/efivarfs/super.c | 3 ++ fs/erofs/xattr.c | 2 - fs/fuse/dev.c | 28 +++++++---- include/linux/mtd/pfow.h | 2 +- include/linux/pm.h | 2 +- include/linux/qcom-geni-se.h | 3 ++ include/net/netfilter/nf_tables.h | 6 +++ include/uapi/linux/bpf.h | 4 +- net/core/sock.c | 1 - net/ipv4/tcp.c | 2 + net/ipv4/tcp_input.c | 3 +- net/netfilter/nf_tables_api.c | 6 +-- net/netfilter/nf_tables_offload.c | 4 +- net/sched/act_mpls.c | 1 + net/sched/sch_netem.c | 9 +++- net/tipc/msg.c | 5 +- scripts/setlocalversion | 21 ++++++-- security/integrity/evm/evm_main.c | 6 +++ tools/include/uapi/linux/bpf.h | 4 +- tools/objtool/orc_gen.c | 33 ++++++++++--- 53 files changed, 331 insertions(+), 172 deletions(-)

4 years, 2 months

4
4
0 0

[PATCH 5.8 00/70] 5.8.18-rc1 review

by Greg Kroah-Hartman

------------------------- Note, this is going to be the LAST 5.8.y kernel release. After this one, this branch is now end-of-life. Please move to the 5.9.y branch at this point in time. ------------------------- This is the start of the stable review cycle for the 5.8.18 release. There are 70 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 Mon, 02 Nov 2020 11:34:42 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.8.18-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.8.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.8.18-rc1 Pali Rohár <pali(a)kernel.org> phy: marvell: comphy: Convert internal SMCC firmware return codes to errno Ricky Wu <ricky_wu(a)realtek.com> misc: rtsx: do not setting OC_POWER_DOWN reg in rtsx_pci_init_ocp() Stafford Horne <shorne(a)gmail.com> openrisc: Fix issue with get_user for 64-bit values Souptick Joarder <jrdr.linux(a)gmail.com> xen/gntdev.c: Mark pages as dirty Geert Uytterhoeven <geert+renesas(a)glider.be> ata: sata_rcar: Fix DMA boundary mask Grygorii Strashko <grygorii.strashko(a)ti.com> PM: runtime: Fix timer_expires data type on 32-bit arches Peter Zijlstra <peterz(a)infradead.org> serial: pl011: Fix lockdep splat when handling magic-sysrq interrupt Paras Sharma <parashar(a)codeaurora.org> serial: qcom_geni_serial: To correct QUP Version detection logic Chris Wilson <chris(a)chris-wilson.co.uk> drm/i915/gem: Serialise debugfs i915_gem_objects with ctx->mutex Gustavo A. R. Silva <gustavo(a)embeddedor.com> mtd: lpddr: Fix bad logic in print_drs_error Jason Gunthorpe <jgg(a)nvidia.com> RDMA/addr: Fix race with netevent_callback()/rdma_addr_cancel() Frederic Barrat <fbarrat(a)linux.ibm.com> cxl: Rework error message for incompatible slots Jia-Ju Bai <baijiaju(a)tsinghua.edu.cn> p54: avoid accessing the data mapped to streaming DMA Roberto Sassu <roberto.sassu(a)huawei.com> evm: Check size of security.evm before using it Song Liu <songliubraving(a)fb.com> bpf: Fix comment for helper bpf_current_task_under_cgroup() Miklos Szeredi <mszeredi(a)redhat.com> fuse: fix page dereference after free Pali Rohár <pali(a)kernel.org> ata: ahci: mvebu: Make SATA PHY optional for Armada 3720 Pali Rohár <pali(a)kernel.org> PCI: aardvark: Fix initialization with old Marvell's Arm Trusted Firmware Juergen Gross <jgross(a)suse.com> x86/xen: disable Firmware First mode for correctable memory errors Thomas Gleixner <tglx(a)linutronix.de> x86/traps: Fix #DE Oops message regression Kim Phillips <kim.phillips(a)amd.com> arch/x86/amd/ibs: Fix re-arming IBS Fetch Gao Xiang <hsiangkao(a)redhat.com> erofs: avoid duplicated permission check for "trusted." xattrs Leon Romanovsky <leonro(a)nvidia.com> net: protect tcf_block_unbind with block lock Tung Nguyen <tung.q.nguyen(a)dektech.com.au> tipc: fix memory leak caused by tipc_buf_append() Arjun Roy <arjunroy(a)google.com> tcp: Prevent low rmem stalls with SO_RCVLOWAT. Andrew Gabbasov <andrew_gabbasov(a)mentor.com> ravb: Fix bit fields checking in ravb_hwtstamp_get() Heiner Kallweit <hkallweit1(a)gmail.com> r8169: fix issue with forced threading in combination with shared interrupts Guillaume Nault <gnault(a)redhat.com> net/sched: act_mpls: Add softdep on mpls_gso.ko Alex Elder <elder(a)linaro.org> net: ipa: command payloads already mapped Zenghui Yu <yuzenghui(a)huawei.com> net: hns3: Clear the CMDQ registers before unmapping BAR region Aleksandr Nogikh <nogikh(a)google.com> netem: fix zero division in tabledist Ido Schimmel <idosch(a)nvidia.com> mlxsw: core: Fix memory leak on module removal Lijun Pan <ljp(a)linux.ibm.com> ibmvnic: fix ibmvnic_set_mac Thomas Bogendoerfer <tbogendoerfer(a)suse.de> ibmveth: Fix use of ibmveth in a bridge. Masahiro Fujiwara <fujiwara.masahiro(a)gmail.com> gtp: fix an use-before-init in gtp_newlink() Raju Rangoju <rajur(a)chelsio.com> cxgb4: set up filter action after rewrites Vinay Kumar Yadav <vinay.yadav(a)chelsio.com> chelsio/chtls: fix tls record info to user Vinay Kumar Yadav <vinay.yadav(a)chelsio.com> chelsio/chtls: fix memory leaks in CPL handlers Vinay Kumar Yadav <vinay.yadav(a)chelsio.com> chelsio/chtls: fix deadlock issue Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Send HWRM_FUNC_RESET fw command unconditionally. Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Re-write PCI BARs after PCI fatal error. Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Invoke cancel_delayed_work_sync() for PFs also. Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Fix regression in workqueue cleanup logic in bnxt_remove_one(). Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Check abort error state in bnxt_open_nic(). Michael Schaller <misch(a)google.com> efivarfs: Replace invalid slashes with exclamation marks in dentries. Dan Williams <dan.j.williams(a)intel.com> x86/copy_mc: Introduce copy_mc_enhanced_fast_string() Dan Williams <dan.j.williams(a)intel.com> x86, powerpc: Rename memcpy_mcsafe() to copy_mc_to_{user, kernel}() Randy Dunlap <rdunlap(a)infradead.org> x86/PCI: Fix intel_mid_pci.c build error when ACPI is not enabled Nick Desaulniers <ndesaulniers(a)google.com> arm64: link with -z norelro regardless of CONFIG_RELOCATABLE Marc Zyngier <maz(a)kernel.org> arm64: Run ARCH_WORKAROUND_2 enabling code on all CPUs Marc Zyngier <maz(a)kernel.org> arm64: Run ARCH_WORKAROUND_1 enabling code on all CPUs Kees Cook <keescook(a)chromium.org> fs/kernel_read_file: Remove FIRMWARE_EFI_EMBEDDED enum Ard Biesheuvel <ardb(a)kernel.org> efi/arm64: libstub: Deal gracefully with EFI_RNG_PROTOCOL failure Rasmus Villemoes <linux(a)rasmusvillemoes.dk> scripts/setlocalversion: make git describe output more reliable Matthew Wilcox (Oracle) <willy(a)infradead.org> io_uring: Convert advanced XArray uses to the normal API Matthew Wilcox (Oracle) <willy(a)infradead.org> io_uring: Fix XArray usage in io_uring_add_task_file Matthew Wilcox (Oracle) <willy(a)infradead.org> io_uring: Fix use of XArray in __io_uring_files_cancel Jens Axboe <axboe(a)kernel.dk> io_uring: no need to call xa_destroy() on empty xarray Hillf Danton <hdanton(a)sina.com> io-wq: fix use-after-free in io_wq_worker_running Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> io_wq: Make io_wqe::lock a raw_spinlock_t Jens Axboe <axboe(a)kernel.dk> io_uring: reference ->nsproxy for file table commands Jens Axboe <axboe(a)kernel.dk> io_uring: don't rely on weak ->files references Jens Axboe <axboe(a)kernel.dk> io_uring: enable task/files specific overflow flushing Jens Axboe <axboe(a)kernel.dk> io_uring: return cancelation status from poll/timeout/files handlers Jens Axboe <axboe(a)kernel.dk> io_uring: unconditionally grab req->task Jens Axboe <axboe(a)kernel.dk> io_uring: stash ctx task reference for SQPOLL Jens Axboe <axboe(a)kernel.dk> io_uring: move dropping of files into separate helper Jens Axboe <axboe(a)kernel.dk> io_uring: allow timeout/poll/files killing to take task into account Jens Axboe <axboe(a)kernel.dk> io_uring: don't run task work on an exiting task Saeed Mirzamohammadi <saeed.mirzamohammadi(a)oracle.com> netfilter: nftables_offload: KASAN slab-out-of-bounds Read in nft_flow_rule_create ------------- Diffstat: Makefile | 4 +- arch/arm64/Makefile | 4 +- arch/arm64/kernel/cpu_errata.c | 15 + arch/openrisc/include/asm/uaccess.h | 35 +- arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/string.h | 2 - arch/powerpc/include/asm/uaccess.h | 40 +- arch/powerpc/lib/Makefile | 2 +- .../lib/{memcpy_mcsafe_64.S => copy_mc_64.S} | 4 +- arch/x86/Kconfig | 2 +- arch/x86/Kconfig.debug | 2 +- arch/x86/events/amd/ibs.c | 15 +- arch/x86/include/asm/copy_mc_test.h | 75 ++++ arch/x86/include/asm/mce.h | 9 + arch/x86/include/asm/mcsafe_test.h | 75 ---- arch/x86/include/asm/string_64.h | 32 -- arch/x86/include/asm/uaccess.h | 9 + arch/x86/include/asm/uaccess_64.h | 20 - arch/x86/kernel/cpu/mce/core.c | 8 +- arch/x86/kernel/quirks.c | 10 +- arch/x86/kernel/traps.c | 2 +- arch/x86/lib/Makefile | 1 + arch/x86/lib/copy_mc.c | 96 +++++ arch/x86/lib/copy_mc_64.S | 163 +++++++ arch/x86/lib/memcpy_64.S | 115 ----- arch/x86/lib/usercopy_64.c | 21 - arch/x86/pci/intel_mid_pci.c | 1 + arch/x86/xen/enlighten_pv.c | 9 + drivers/ata/ahci.h | 2 + drivers/ata/ahci_mvebu.c | 2 +- drivers/ata/libahci_platform.c | 2 +- drivers/ata/sata_rcar.c | 2 +- drivers/base/firmware_loader/fallback_platform.c | 2 +- drivers/crypto/chelsio/chtls/chtls_cm.c | 29 +- drivers/crypto/chelsio/chtls/chtls_io.c | 7 +- drivers/firmware/efi/libstub/arm64-stub.c | 8 +- drivers/firmware/efi/libstub/fdt.c | 4 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 + drivers/infiniband/core/addr.c | 11 +- drivers/md/dm-writecache.c | 15 +- drivers/misc/cardreader/rtsx_pcr.c | 4 - drivers/misc/cxl/pci.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 49 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 56 ++- drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h | 4 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- drivers/net/ethernet/ibm/ibmveth.c | 6 - drivers/net/ethernet/ibm/ibmvnic.c | 8 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 2 + drivers/net/ethernet/realtek/r8169_main.c | 4 +- drivers/net/ethernet/renesas/ravb_main.c | 10 +- drivers/net/gtp.c | 16 +- drivers/net/ipa/gsi_trans.c | 21 +- drivers/net/wireless/intersil/p54/p54pci.c | 4 +- drivers/nvdimm/claim.c | 2 +- drivers/nvdimm/pmem.c | 6 +- drivers/pci/controller/pci-aardvark.c | 4 +- drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 14 +- drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 14 +- drivers/tty/serial/amba-pl011.c | 11 +- drivers/tty/serial/qcom_geni_serial.c | 2 +- drivers/xen/gntdev.c | 17 +- fs/efivarfs/super.c | 3 + fs/erofs/xattr.c | 2 - fs/exec.c | 6 + fs/file.c | 2 + fs/fuse/dev.c | 28 +- fs/io-wq.c | 172 ++++---- fs/io-wq.h | 1 + fs/io_uring.c | 475 ++++++++++++++++----- include/linux/fs.h | 1 - include/linux/io_uring.h | 53 +++ include/linux/mtd/pfow.h | 2 +- include/linux/pm.h | 2 +- include/linux/qcom-geni-se.h | 3 + include/linux/sched.h | 5 + include/linux/string.h | 9 +- include/linux/uaccess.h | 13 + include/linux/uio.h | 10 +- include/net/netfilter/nf_tables.h | 6 + include/uapi/linux/bpf.h | 4 +- init/init_task.c | 3 + kernel/fork.c | 6 + lib/Kconfig | 7 +- lib/iov_iter.c | 48 +-- net/ipv4/tcp.c | 2 + net/ipv4/tcp_input.c | 3 +- net/netfilter/nf_tables_api.c | 6 +- net/netfilter/nf_tables_offload.c | 4 +- net/sched/act_mpls.c | 1 + net/sched/cls_api.c | 4 +- net/sched/sch_netem.c | 9 +- net/tipc/msg.c | 5 +- scripts/setlocalversion | 21 +- security/integrity/evm/evm_main.c | 6 + tools/arch/x86/include/asm/mcsafe_test.h | 13 - tools/arch/x86/lib/memcpy_64.S | 115 ----- tools/include/uapi/linux/bpf.h | 4 +- tools/objtool/check.c | 5 +- tools/perf/bench/Build | 1 - tools/perf/bench/mem-memcpy-x86-64-lib.c | 24 -- tools/testing/nvdimm/test/nfit.c | 49 +-- .../testing/selftests/powerpc/copyloops/.gitignore | 2 +- tools/testing/selftests/powerpc/copyloops/Makefile | 6 +- .../selftests/powerpc/copyloops/copy_mc_64.S | 242 +++++++++++ 106 files changed, 1595 insertions(+), 908 deletions(-)

4 years, 2 months

4
73
0 0

[PATCH v2] drm/panfrost: Move the GPU reset bits outside the timeout handler

by Boris Brezillon

We've fixed many races in panfrost_job_timedout() but some remain. Instead of trying to fix it again, let's simplify the logic and move the reset bits to a separate work scheduled when one of the queue reports a timeout. v2: - Use atomic_cmpxchg() to conditionally schedule the reset work (Steven Privce) Fixes: 1a11a88cfd9a ("drm/panfrost: Fix job timeout handling") Cc: <stable(a)vger.kernel.org> Signed-off-by: Boris Brezillon <boris.brezillon(a)collabora.com> --- drivers/gpu/drm/panfrost/panfrost_device.c | 1 - drivers/gpu/drm/panfrost/panfrost_device.h | 6 +- drivers/gpu/drm/panfrost/panfrost_job.c | 127 ++++++++++++--------- 3 files changed, 79 insertions(+), 55 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index ea8d31863c50..a83b2ff5837a 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -200,7 +200,6 @@ int panfrost_device_init(struct panfrost_device *pfdev) struct resource *res; mutex_init(&pfdev->sched_lock); - mutex_init(&pfdev->reset_lock); INIT_LIST_HEAD(&pfdev->scheduled_jobs); INIT_LIST_HEAD(&pfdev->as_lru_list); diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index 140e004a3790..597cf1459b0a 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -106,7 +106,11 @@ struct panfrost_device { struct panfrost_perfcnt *perfcnt; struct mutex sched_lock; - struct mutex reset_lock; + + struct { + struct work_struct work; + atomic_t pending; + } reset; struct mutex shrinker_lock; struct list_head shrinker_list; diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c index 4902bc6624c8..14c11293791e 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -20,6 +20,8 @@ #include "panfrost_gpu.h" #include "panfrost_mmu.h" +#define JOB_TIMEOUT_MS 500 + #define job_write(dev, reg, data) writel(data, dev->iomem + (reg)) #define job_read(dev, reg) readl(dev->iomem + (reg)) @@ -382,19 +384,37 @@ static bool panfrost_scheduler_stop(struct panfrost_queue_state *queue, drm_sched_increase_karma(bad); queue->stopped = true; stopped = true; + + /* + * Set the timeout to max so the timer doesn't get started + * when we return from the timeout handler (restored in + * panfrost_scheduler_start()). + */ + queue->sched.timeout = MAX_SCHEDULE_TIMEOUT; } mutex_unlock(&queue->lock); return stopped; } +static void panfrost_scheduler_start(struct panfrost_queue_state *queue) +{ + if (WARN_ON(!queue->stopped)) + return; + + mutex_lock(&queue->lock); + /* Restore the original timeout before starting the scheduler. */ + queue->sched.timeout = msecs_to_jiffies(JOB_TIMEOUT_MS); + drm_sched_start(&queue->sched, true); + queue->stopped = false; + mutex_unlock(&queue->lock); +} + static void panfrost_job_timedout(struct drm_sched_job *sched_job) { struct panfrost_job *job = to_panfrost_job(sched_job); struct panfrost_device *pfdev = job->pfdev; int js = panfrost_job_get_slot(job); - unsigned long flags; - int i; /* * If the GPU managed to complete this jobs fence, the timeout is @@ -415,56 +435,9 @@ static void panfrost_job_timedout(struct drm_sched_job *sched_job) if (!panfrost_scheduler_stop(&pfdev->js->queue[js], sched_job)) return; - if (!mutex_trylock(&pfdev->reset_lock)) - return; - - for (i = 0; i < NUM_JOB_SLOTS; i++) { - struct drm_gpu_scheduler *sched = &pfdev->js->queue[i].sched; - - /* - * If the queue is still active, make sure we wait for any - * pending timeouts. - */ - if (!pfdev->js->queue[i].stopped) - cancel_delayed_work_sync(&sched->work_tdr); - - /* - * If the scheduler was not already stopped, there's a tiny - * chance a timeout has expired just before we stopped it, and - * drm_sched_stop() does not flush pending works. Let's flush - * them now so the timeout handler doesn't get called in the - * middle of a reset. - */ - if (panfrost_scheduler_stop(&pfdev->js->queue[i], NULL)) - cancel_delayed_work_sync(&sched->work_tdr); - - /* - * Now that we cancelled the pending timeouts, we can safely - * reset the stopped state. - */ - pfdev->js->queue[i].stopped = false; - } - - spin_lock_irqsave(&pfdev->js->job_lock, flags); - for (i = 0; i < NUM_JOB_SLOTS; i++) { - if (pfdev->jobs[i]) { - pm_runtime_put_noidle(pfdev->dev); - panfrost_devfreq_record_idle(&pfdev->pfdevfreq); - pfdev->jobs[i] = NULL; - } - } - spin_unlock_irqrestore(&pfdev->js->job_lock, flags); - - panfrost_device_reset(pfdev); - - for (i = 0; i < NUM_JOB_SLOTS; i++) - drm_sched_resubmit_jobs(&pfdev->js->queue[i].sched); - - mutex_unlock(&pfdev->reset_lock); - - /* restart scheduler after GPU is usable again */ - for (i = 0; i < NUM_JOB_SLOTS; i++) - drm_sched_start(&pfdev->js->queue[i].sched, true); + /* Schedule a reset if there's no reset in progress. */ + if (!atomic_cmpxchg(&pfdev->reset.pending, 0, 1)) + schedule_work(&pfdev->reset.work); } static const struct drm_sched_backend_ops panfrost_sched_ops = { @@ -531,11 +504,59 @@ static irqreturn_t panfrost_job_irq_handler(int irq, void *data) return IRQ_HANDLED; } +static void panfrost_reset(struct work_struct *work) +{ + struct panfrost_device *pfdev = container_of(work, + struct panfrost_device, + reset.work); + unsigned long flags; + unsigned int i; + + for (i = 0; i < NUM_JOB_SLOTS; i++) { + /* + * We want pending timeouts to be handled before we attempt + * to stop the scheduler. If we don't do that and the timeout + * handler is in flight, it might have removed the bad job + * from the list, and we'll lose this job if the reset handler + * enters the critical section in panfrost_scheduler_stop() + * before the timeout handler. + * + * Timeout is set to max to make sure the timer is not + * restarted after the cancellation. + */ + pfdev->js->queue[i].sched.timeout = MAX_SCHEDULE_TIMEOUT; + cancel_delayed_work_sync(&pfdev->js->queue[i].sched.work_tdr); + panfrost_scheduler_stop(&pfdev->js->queue[i], NULL); + } + + /* All timers have been stopped, we can safely reset the pending state. */ + atomic_set(&pfdev->reset.pending, 0); + + spin_lock_irqsave(&pfdev->js->job_lock, flags); + for (i = 0; i < NUM_JOB_SLOTS; i++) { + if (pfdev->jobs[i]) { + pm_runtime_put_noidle(pfdev->dev); + panfrost_devfreq_record_idle(&pfdev->pfdevfreq); + pfdev->jobs[i] = NULL; + } + } + spin_unlock_irqrestore(&pfdev->js->job_lock, flags); + + panfrost_device_reset(pfdev); + + for (i = 0; i < NUM_JOB_SLOTS; i++) { + drm_sched_resubmit_jobs(&pfdev->js->queue[i].sched); + panfrost_scheduler_start(&pfdev->js->queue[i]); + } +} + int panfrost_job_init(struct panfrost_device *pfdev) { struct panfrost_job_slot *js; int ret, j, irq; + INIT_WORK(&pfdev->reset.work, panfrost_reset); + pfdev->js = js = devm_kzalloc(pfdev->dev, sizeof(*js), GFP_KERNEL); if (!js) return -ENOMEM; @@ -560,7 +581,7 @@ int panfrost_job_init(struct panfrost_device *pfdev) ret = drm_sched_init(&js->queue[j].sched, &panfrost_sched_ops, - 1, 0, msecs_to_jiffies(500), + 1, 0, msecs_to_jiffies(JOB_TIMEOUT_MS), "pan_js"); if (ret) { dev_err(pfdev->dev, "Failed to create scheduler: %d.", ret); -- 2.26.2

4 years, 2 months

3
3
0 0

[PATCH] x86_64: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S

by Fangrui Song

Commit 393f203f5fd5 ("x86_64: kasan: add interceptors for memset/memmove/memcpy functions") added .weak directives to arch/x86/lib/mem*_64.S instead of changing the existing SYM_FUNC_START_* macros. This can lead to the assembly snippet `.weak memcpy ... .globl memcpy` which will produce a STB_WEAK memcpy with GNU as but STB_GLOBAL memcpy with LLVM's integrated assembler before LLVM 12. LLVM 12 (since https://reviews.llvm.org/D90108) will error on such an overridden symbol binding. Use the appropriate SYM_FUNC_START_WEAK instead. Fixes: 393f203f5fd5 ("x86_64: kasan: add interceptors for memset/memmove/memcpy functions") Reported-by: Sami Tolvanen <samitolvanen(a)google.com> Signed-off-by: Fangrui Song <maskray(a)google.com> Cc: <stable(a)vger.kernel.org> --- arch/x86/lib/memcpy_64.S | 4 +--- arch/x86/lib/memmove_64.S | 4 +--- arch/x86/lib/memset_64.S | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index 037faac46b0c..1e299ac73c86 100644 --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S @@ -16,8 +16,6 @@ * to a jmp to memcpy_erms which does the REP; MOVSB mem copy. */ -.weak memcpy - /* * memcpy - Copy a memory block. * @@ -30,7 +28,7 @@ * rax original destination */ SYM_FUNC_START_ALIAS(__memcpy) -SYM_FUNC_START_LOCAL(memcpy) +SYM_FUNC_START_WEAK(memcpy) ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \ "jmp memcpy_erms", X86_FEATURE_ERMS diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S index 7ff00ea64e4f..41902fe8b859 100644 --- a/arch/x86/lib/memmove_64.S +++ b/arch/x86/lib/memmove_64.S @@ -24,9 +24,7 @@ * Output: * rax: dest */ -.weak memmove - -SYM_FUNC_START_ALIAS(memmove) +SYM_FUNC_START_WEAK(memmove) SYM_FUNC_START(__memmove) mov %rdi, %rax diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S index 9ff15ee404a4..0bfd26e4ca9e 100644 --- a/arch/x86/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S @@ -6,8 +6,6 @@ #include <asm/alternative-asm.h> #include <asm/export.h> -.weak memset - /* * ISO C memset - set a memory block to a byte value. This function uses fast * string to get better performance than the original function. The code is @@ -19,7 +17,7 @@ * * rax original destination */ -SYM_FUNC_START_ALIAS(memset) +SYM_FUNC_START_WEAK(memset) SYM_FUNC_START(__memset) /* * Some CPUs support enhanced REP MOVSB/STOSB feature. It is recommended -- 2.29.1.341.ge80a0c044ae-goog

4 years, 2 months

5
5
0 0

Re: [PATCH] Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE

by Greg KH

A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail? A: No. Q: Should I include quotations after my reply? http://daringfireball.net/2007/07/on_top On Thu, Oct 29, 2020 at 08:23:57AM -0700, Chris Ye wrote: > Haha, thanks! > I have fixed my git config and sent a new mail, can you check it? Do you have a pointer to it on lore.kernel.org? And you did properly version the patch, right? thanks, greg k-h

4 years, 2 months

2
3
0 0

Linux 4.19.154

by Greg Kroah-Hartman

I'm announcing the release of the 4.19.154 kernel. All users of the 4.19 kernel series must upgrade. Many thanks to Pavel Machek for pointing out that the last 4.19.y release was "short" a bunch of patches, which results in this "the rest of the series" release. The updated 4.19.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arm/boot/dts/imx6sl.dtsi | 2 arch/arm/boot/dts/owl-s500.dtsi | 6 arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 10 - arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 arch/arm64/boot/dts/qcom/pm8916.dtsi | 2 arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 arch/powerpc/include/asm/tlb.h | 13 - arch/powerpc/kernel/tau_6xx.c | 96 +++------- arch/powerpc/mm/tlb-radix.c | 23 +- arch/powerpc/perf/hv-gpci-requests.h | 6 arch/powerpc/perf/isa207-common.c | 10 + arch/powerpc/platforms/Kconfig | 14 - arch/powerpc/platforms/powernv/opal-dump.c | 41 +++- arch/x86/kvm/emulate.c | 2 block/blk-core.c | 9 drivers/clk/at91/clk-main.c | 11 - drivers/clk/bcm/clk-bcm2835.c | 4 drivers/clk/rockchip/clk-half-divider.c | 2 drivers/cpufreq/powernv-cpufreq.c | 9 drivers/crypto/ccp/ccp-ops.c | 2 drivers/gpu/drm/virtio/virtgpu_kms.c | 2 drivers/gpu/drm/virtio/virtgpu_vq.c | 10 - drivers/i2c/busses/Kconfig | 1 drivers/i2c/i2c-core-acpi.c | 11 + drivers/infiniband/core/cma.c | 84 +++----- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 1 drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1 drivers/infiniband/sw/rdmavt/vt.c | 4 drivers/input/keyboard/ep93xx_keypad.c | 4 drivers/input/keyboard/omap4-keypad.c | 6 drivers/input/keyboard/twl4030_keypad.c | 8 drivers/input/serio/sun4i-ps2.c | 9 drivers/input/touchscreen/imx6ul_tsc.c | 27 +- drivers/input/touchscreen/stmfts.c | 2 drivers/mailbox/mailbox.c | 12 - drivers/media/firewire/firedtv-fw.c | 6 drivers/media/pci/bt8xx/bttv-driver.c | 13 + drivers/media/pci/saa7134/saa7134-tvaudio.c | 3 drivers/media/platform/exynos4-is/fimc-isp.c | 4 drivers/media/platform/exynos4-is/fimc-lite.c | 2 drivers/media/platform/exynos4-is/media-dev.c | 4 drivers/media/platform/exynos4-is/mipi-csis.c | 4 drivers/media/platform/qcom/venus/core.c | 5 drivers/media/platform/s3c-camif/camif-core.c | 5 drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 drivers/media/platform/sti/delta/delta-v4l2.c | 4 drivers/media/platform/sti/hva/hva-hw.c | 4 drivers/media/platform/vsp1/vsp1_drv.c | 11 - drivers/media/rc/ati_remote.c | 4 drivers/media/usb/uvc/uvc_v4l2.c | 30 +++ drivers/memory/fsl-corenet-cf.c | 6 drivers/memory/omap-gpmc.c | 8 drivers/misc/cardreader/rtsx_pcr.c | 4 drivers/misc/eeprom/at25.c | 2 drivers/misc/mic/vop/vop_main.c | 2 drivers/misc/mic/vop/vop_vringh.c | 24 +- drivers/mmc/core/sdio_cis.c | 3 drivers/net/can/flexcan.c | 34 ++- drivers/net/ethernet/korina.c | 4 drivers/net/wireless/ath/ath10k/htt_rx.c | 8 drivers/net/wireless/ath/ath9k/hif_usb.c | 19 + drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 4 drivers/net/wireless/marvell/mwifiex/usb.c | 3 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 - drivers/ntb/hw/amd/ntb_hw_amd.c | 1 drivers/nvme/target/core.c | 3 drivers/pci/controller/pcie-iproc-msi.c | 13 - drivers/pwm/pwm-img.c | 3 drivers/rapidio/devices/rio_mport_cdev.c | 18 + drivers/rpmsg/qcom_smd.c | 32 ++- drivers/scsi/ibmvscsi/ibmvfc.c | 1 drivers/scsi/mvumi.c | 1 drivers/scsi/qedi/qedi_fw.c | 23 +- drivers/scsi/qedi/qedi_iscsi.c | 2 drivers/scsi/ufs/ufs-qcom.c | 5 drivers/tty/ipwireless/network.c | 4 drivers/tty/ipwireless/tty.c | 2 drivers/tty/serial/fsl_lpuart.c | 2 drivers/usb/class/cdc-acm.c | 23 ++ drivers/usb/class/cdc-wdm.c | 72 +++++-- drivers/usb/core/urb.c | 89 +++++---- drivers/usb/dwc3/dwc3-of-simple.c | 1 drivers/usb/gadget/function/f_ncm.c | 2 drivers/usb/gadget/function/f_printer.c | 16 + drivers/usb/host/ohci-hcd.c | 16 + drivers/vfio/pci/vfio_pci_intrs.c | 4 drivers/vfio/vfio_iommu_type1.c | 3 drivers/watchdog/sp5100_tco.h | 2 drivers/watchdog/watchdog_dev.c | 6 fs/dlm/config.c | 3 fs/ext4/fsmap.c | 3 fs/f2fs/sysfs.c | 1 fs/ntfs/inode.c | 6 fs/ramfs/file-nommu.c | 2 fs/reiserfs/inode.c | 3 fs/reiserfs/super.c | 8 fs/udf/inode.c | 25 +- fs/udf/super.c | 6 fs/xfs/xfs_rtalloc.c | 11 + include/linux/overflow.h | 1 include/scsi/scsi_common.h | 7 include/trace/events/target.h | 12 - include/uapi/linux/perf_event.h | 2 kernel/debug/kdb/kdb_io.c | 8 kernel/power/hibernate.c | 11 - kernel/sched/core.c | 2 kernel/sched/sched.h | 13 + lib/crc32.c | 2 net/bluetooth/l2cap_sock.c | 7 net/ipv4/ip_gre.c | 15 + net/mac80211/cfg.c | 3 net/mac80211/sta_info.c | 4 net/netfilter/ipvs/ip_vs_ctl.c | 7 net/netfilter/nf_conntrack_proto_tcp.c | 19 + net/netfilter/nf_dup_netdev.c | 1 net/netfilter/nft_fwd_netdev.c | 1 net/sunrpc/auth_gss/svcauth_gss.c | 27 +- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 3 samples/mic/mpssd/mpssd.c | 4 tools/perf/util/intel-pt.c | 8 122 files changed, 808 insertions(+), 450 deletions(-) Abhishek Pandit-Subedi (1): Bluetooth: Only mark socket zapped after unlocking Adam Goode (1): media: uvcvideo: Ensure all probed info is returned to v4l2 Aditya Pakki (1): media: st-delta: Fix reference count leak in delta_run_work Adrian Hunter (1): perf intel-pt: Fix "context_switch event has no tid" error Al Grant (1): perf: correct SNOOPX field offset Alex Williamson (1): vfio/pci: Clear token on bypass registration failure Alexander Aring (1): fs: dlm: fix configfs memory leak Athira Rajeev (1): powerpc/perf: Exclude pmc5/6 from the irrelevant PMU group constraints Brooke Basile (1): ath9k: hif_usb: fix race condition between usb_get_urb() and usb_kill_anchored_urbs() Can Guo (1): scsi: ufs: ufs-qcom: Fix race conditions caused by ufs_qcom_testbus_config() Chris Chiu (1): rtl8xxxu: prevent potential memory leak Christian Eggers (1): eeprom: at25: set minimum read/write access stride to 1 Christoph Hellwig (1): PM: hibernate: remove the bogus call to get_gendisk() in software_resume() Claudiu Beznea (1): clk: at91: clk-main: update key before writing AT91_CKGR_MOR Colin Ian King (1): IB/rdmavt: Fix sizeof mismatch Cong Wang (1): ip_gre: set dev->hard_header_len and dev->needed_headroom properly Cristian Ciocaltea (1): ARM: dts: owl-s500: Fix incorrect PPI interrupt specifiers Dan Aloni (1): svcrdma: fix bounce buffers for unaligned offsets and multiple pages Dan Carpenter (3): rpmsg: smd: Fix a kobj leak in in qcom_smd_parse_edge() Input: imx6ul_tsc - clean up some errors in imx6ul_tsc_resume() memory: omap-gpmc: Fix a couple off by ones Daniel Thompson (1): kdb: Fix pager search for multi-line strings Darrick J. Wong (2): ext4: limit entries returned when counting fsmap records xfs: make sure the rt allocator doesn't run off the end Dinghao Liu (7): watchdog: Fix memleak in watchdog_cdev_register watchdog: Use put_device on error media: vsp1: Fix runtime PM imbalance on error media: platform: s3c-camif: Fix runtime PM imbalance on error media: platform: sti: hva: Fix runtime PM imbalance on error media: bdisp: Fix runtime PM imbalance on error media: venus: core: Fix runtime PM imbalance in venus_probe Dirk Behme (1): i2c: rcar: Auto select RESET_CONTROLLER Doug Horn (1): Fix use after free in get_capset_info callback. Eli Billauer (1): usb: core: Solve race condition in anchor cleanup functions Eric Biggers (1): reiserfs: only call unlock_new_inode() if I_NEW Finn Thain (2): powerpc/tau: Check processor type before enabling TAU interrupt powerpc/tau: Disable TAU between measurements Francesco Ruggeri (1): netfilter: conntrack: connection timeout after re-register Greg Kroah-Hartman (1): Linux 4.19.154 Guenter Roeck (1): watchdog: sp5100: Fix definition of EFCH_PM_DECODEEN3 Hamish Martin (1): usb: ohci: Default to per-port over-current protection Hans de Goede (1): i2c: core: Restore acpi_walk_dep_device_list() getting called after registering the ACPI i2c devs Hauke Mehrtens (1): pwm: img: Fix null pointer access in probe Horia Geantă (1): ARM: dts: imx6sl: fix rng node Jamie Iles (1): f2fs: wait for sysfs kobject removal before freeing f2fs_sb_info Jan Kara (3): udf: Limit sparing table size udf: Avoid accessing uninitialized data on failed inode read reiserfs: Fix memory leak in reiserfs_parse_options() Jason Gunthorpe (2): RDMA/cma: Remove dead code for kernel rdmacm multicast RDMA/cma: Consolidate the destruction of a cma_multicast in one place Jassi Brar (1): mailbox: avoid timer start from callback Jernej Skrabec (1): ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix dcdc1 regulator Jing Xiangfeng (3): rapidio: fix the missed put_device() for rio_mport_add_riodev scsi: mvumi: Fix error return in mvumi_io_attach() scsi: ibmvfc: Fix error return in ibmvfc_probe() Joakim Zhang (1): can: flexcan: flexcan_chip_stop(): add error handling and propagate error value Johan Hovold (1): USB: cdc-acm: handle broken union descriptors Juri Lelli (1): sched/features: Fix !CONFIG_JUMP_LABEL case Kaige Li (1): NTB: hw: amd: fix an issue about leak system resources Kajol Jain (1): powerpc/perf/hv-gpci: Fix starting index value Keita Suzuki (2): misc: rtsx: Fix memory leak in rtsx_pci_probe brcmsmac: fix memory leak in wlc_phy_attach_lcnphy Krzysztof Kozlowski (5): Input: ep93xx_keypad - fix handling of platform_get_irq() error Input: omap4-keypad - fix handling of platform_get_irq() error Input: twl4030_keypad - fix handling of platform_get_irq() error Input: sun4i-ps2 - fix handling of platform_get_irq() error memory: fsl-corenet-cf: Fix handling of platform_get_irq() error Leon Romanovsky (1): overflow: Include header file with SIZE_MAX declaration Lijun Ou (1): RDMA/hns: Set the unsupported wr opcode Lorenzo Colitti (1): usb: gadget: f_ncm: allow using NCM in SuperSpeed Plus gadgets. Mark Tomlinson (1): PCI: iproc: Set affinity mask on MSI interrupts Martijn de Gouw (1): SUNRPC: fix copying of multiple pages in gss_read_proxy_verf() Matthew Wilcox (Oracle) (1): ramfs: fix nommu mmap with gaps in the page cache Mauro Carvalho Chehab (2): media: saa7134: avoid a shift overflow usb: dwc3: simple: add support for Hikey 970 Michal Simek (1): arm64: dts: zynqmp: Remove additional compatible string for i2c IPs Navid Emamdoost (1): clk: bcm2835: add missing release if devm_clk_hw_register fails Nicholas Piggin (1): powerpc/64s/radix: Fix mm_cpumask trimming race vs kthread_use_mm Nilesh Javali (2): scsi: qedi: Protect active command list to avoid list corruption scsi: qedi: Fix list_del corruption while removing active I/O Oliver Neukum (2): media: ati_remote: sanity check for both endpoints USB: cdc-wdm: Make wdm_flush() interruptible and add wdm_fsync(). Pablo Neira Ayuso (1): netfilter: nf_fwd_netdev: clear timestamp in forwarding path Pali Rohár (1): mmc: sdio: Check for CISTPL_VERS_1 buffer size Pavel Machek (2): crypto: ccp - fix error handling media: firewire: fix memory leak Peilin Ye (1): ipvs: Fix uninit-value in do_ip_vs_set_ctl() Peng Fan (1): tty: serial: fsl_lpuart: fix lpuart32_poll_get_char Qiushi Wu (4): media: sti: Fix reference count leaks media: exynos4-is: Fix several reference count leaks due to pm_runtime_get_sync media: exynos4-is: Fix a reference count leak due to pm_runtime_get_sync media: exynos4-is: Fix a reference count leak Robert Hoo (1): KVM: x86: emulating RDPID failure shall return #UD rather than #GP Roman Bolshakov (1): scsi: target: core: Add CONTROL field for trace events Rustam Kovhaev (1): ntfs: add check for mft record size in superblock Sherry Sun (2): mic: vop: copy data to kernel space then write to io memory misc: vop: add round_up(x,4) for vring_size to avoid kernel panic Souptick Joarder (1): rapidio: fix error handling path Srikar Dronamraju (1): cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_reboot_notifier Stephan Gerhold (2): arm64: dts: qcom: pm8916: Remove invalid reg size from wcd_codec arm64: dts: qcom: msm8916: Fix MDP/DSI interrupts Stephen Boyd (1): clk: rockchip: Initialize hw to error to avoid undefined behavior Tetsuo Handa (2): block: ratelimit handle_bad_sector() message mwifiex: don't call del_timer_sync() on uninitialized timer Thomas Pedersen (1): mac80211: handle lack of sband->bitrates in rates Tobias Jordan (1): lib/crc32.c: fix trivial typo in preprocessor condition Tong Zhang (1): tty: ipwireless: fix error handling Valentin Vidic (1): net: korina: cast KSEG0 address to pointer in kfree Vasant Hegde (1): powerpc/powernv/dump: Fix race while processing OPAL dump Vincent Mailhol (1): usb: cdc-acm: add quirk to blacklist ETAS ES58X devices Wang Yufen (1): brcm80211: fix possible memleak in brcmf_proto_msgbuf_attach Weihang Li (1): RDMA/hns: Fix missing sq_sig_type when querying QP Xiaolong Huang (1): media: media/pci: prevent memory leak in bttv_probe Xiaoyang Xu (1): vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages YueHaibing (2): Input: stmfts - fix a & vs && typo memory: omap-gpmc: Fix build error without CONFIG_OF Zekun Shen (1): ath10k: check idx validity in __ath10k_htt_rx_ring_fill_n() Zqiang (1): usb: gadget: function: printer: fix use-after-free in __lock_acquire zhenwei pi (1): nvmet: fix uninitialized work for zero kato

4 years, 2 months

3
4
0 0

[PATCH 4.19 0/5] backport some more fscrypt fixes to 4.19

by Eric Biggers

Backport some fscrypt fixes from upstream 5.2 to 4.19-stable. This is needed to get 'kvm-xfstests -c ext4,f2fs,ubifs -g encrypt' to fully pass on 4.19-stable. Before, generic/397 and generic/429 failed on UBIFS due to missing "fscrypt: fix race where ->lookup() marks plaintext dentry as ciphertext". This also fixes some bugs that aren't yet covered by the xfstests. E.g., "fs, fscrypt: clear DCACHE_ENCRYPTED_NAME when unaliasing directory" fixes a bug that caused real-world problems on Chrome OS. Some relatively straightforward adjustments were needed to the patches, mainly due to the refactoring of fscrypt.h that was done in 5.1. Eric Biggers (5): fscrypt: clean up and improve dentry revalidation fscrypt: fix race allowing rename() and link() of ciphertext dentries fs, fscrypt: clear DCACHE_ENCRYPTED_NAME when unaliasing directory fscrypt: only set dentry_operations on ciphertext dentries fscrypt: fix race where ->lookup() marks plaintext dentry as ciphertext fs/crypto/crypto.c | 58 +++++++++++++------------ fs/crypto/fname.c | 1 + fs/crypto/hooks.c | 28 ++++++++---- fs/dcache.c | 15 +++++++ fs/ext4/ext4.h | 62 ++++++++++++++++++++------- fs/ext4/namei.c | 76 ++++++++++++++++++++++----------- fs/f2fs/namei.c | 17 +++++--- fs/ubifs/dir.c | 8 ++-- include/linux/dcache.h | 2 +- include/linux/fscrypt.h | 30 +++++++------ include/linux/fscrypt_notsupp.h | 9 ++-- include/linux/fscrypt_supp.h | 6 ++- 12 files changed, 205 insertions(+), 107 deletions(-) -- 2.29.1

4 years, 2 months

2
6
0 0

[PATCH 4.9 0/2] backport some more fscrypt fixes to 4.9

by Eric Biggers

Backport some fscrypt fixes from 4.10 and 4.11 to 4.9-stable. These will be needed for xfstest generic/395 to pass if https://lkml.kernel.org/fstests/20201031054018.695314-1-ebiggers@kernel.org is applied. These are clean cherry picks. Tested with 'kvm-xfstests -c ext4,f2fs -g encrypt'. Eric Biggers (2): fscrypto: move ioctl processing more fully into common code fscrypt: use EEXIST when file already uses different policy fs/crypto/policy.c | 36 ++++++++++++++++++++++-------------- fs/ext4/ext4.h | 4 ++-- fs/ext4/ioctl.c | 34 +++++----------------------------- fs/f2fs/f2fs.h | 4 ++-- fs/f2fs/file.c | 19 ++----------------- include/linux/fscrypto.h | 12 ++++++------ 6 files changed, 39 insertions(+), 70 deletions(-) -- 2.29.1

4 years, 2 months

2
3
0 0

[PATCH 4.4] f2fs crypto: avoid unneeded memory allocation in ->readdir

by Eric Biggers

From: Chao Yu <yuchao0(a)huawei.com> commit e06f86e61d7a67fe6e826010f57aa39c674f4b1b upstream. [This backport fixes a regression in 4.4-stable caused by commit 11a6e8f89521 ("f2fs: check memory boundary by insane namelen"), which depended on this missing commit. This bad backport broke f2fs encryption because it moved the incrementing of 'bit_pos' to earlier in f2fs_fill_dentries() without accounting for it being used in the encrypted dir case. This caused readdir() on encrypted directories to start failing. Tested with 'kvm-xfstests -c f2fs -g encrypt'.] When decrypting dirents in ->readdir, fscrypt_fname_disk_to_usr won't change content of original encrypted dirent, we don't need to allocate additional buffer for storing mirror of it, so get rid of it. Signed-off-by: Chao Yu <yuchao0(a)huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk(a)kernel.org> Signed-off-by: Eric Biggers <ebiggers(a)google.com> --- fs/f2fs/dir.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index e2ff0eb16f89c..c1130914d6ed7 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -820,15 +820,8 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, int save_len = fstr->len; int ret; - de_name.name = kmalloc(de_name.len, GFP_NOFS); - if (!de_name.name) - return false; - - memcpy(de_name.name, d->filename[bit_pos], de_name.len); - ret = f2fs_fname_disk_to_usr(d->inode, &de->hash_code, &de_name, fstr); - kfree(de_name.name); if (ret < 0) return true; -- 2.29.1

4 years, 2 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2020