- Linux-stable-mirror - lists.linaro.org

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.149 release. There are 71 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Jan 9 10:53:04 UTC 2019. 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.149-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.149-rc1 Tomas Winkler <tomas.winkler(a)intel.com> tpm: tpm_i2c_nuvoton: use correct command duration for TPM 2.x Maciej W. Rozycki <macro(a)linux-mips.org> rtc: m41t80: Correct alarm month range with RTC reads Will Deacon <will.deacon(a)arm.com> arm64: KVM: Avoid setting the upper 32 bits of VTCR_EL2 to 1 Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/kvm/vmx: do not use vm-exit instruction length for fast MMIO when running nested Georgy A Bystrenin <gkot(a)altlinux.org> CIFS: Fix error mapping for SMB2_LOCK command which caused OFD lock problem Aaro Koskinen <aaro.koskinen(a)iki.fi> MIPS: OCTEON: mark RGMII interface disabled on OCTEON III Huacai Chen <chenhc(a)lemote.com> MIPS: Align kernel load address to 64KB Huacai Chen <chenhc(a)lemote.com> MIPS: Ensure pmd_present() returns false after pmd_mknotpresent() Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: v4l2-tpg: array index could become negative Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: vivid: free bitmap_cap when updating std/timings/etc. Nava kishore Manne <nava.manne(a)xilinx.com> serial: uartps: Fix interrupt mask issue to handle the RX interrupts properly Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> f2fs: fix validation of the block count in sanity_check_raw_super Breno Leitao <leitao(a)debian.org> powerpc/tm: Set MSR[TS] just prior to recheckpoint Josef Bacik <jbacik(a)fb.com> btrfs: run delayed items before dropping the snapshot Filipe Manana <fdmanana(a)suse.com> Btrfs: fix fsync of files with multiple hard links in new directories Macpaul Lin <macpaul.lin(a)mediatek.com> cdc-acm: fix abnormal DATA RX issue for Mediatek Preloader. Johan Jonker <jbx9999(a)hotmail.com> clk: rockchip: fix typo in rk3188 spdif_frac parent Lukas Wunner <lukas(a)wunner.de> spi: bcm2835: Avoid finishing transfer prematurely in IRQ mode Lukas Wunner <lukas(a)wunner.de> spi: bcm2835: Fix book-keeping of DMA termination Lukas Wunner <lukas(a)wunner.de> spi: bcm2835: Fix race on DMA termination Theodore Ts'o <tytso(a)mit.edu> ext4: check for shutdown and r/o file system in ext4_write_inode() Theodore Ts'o <tytso(a)mit.edu> ext4: force inode writes when nfsd calls commit_metadata() Theodore Ts'o <tytso(a)mit.edu> ext4: include terminating u32 in size of xattr entries when expanding inodes ruippan (潘睿) <ruippan(a)tencent.com> ext4: fix EXT4_IOC_GROUP_ADD ioctl Maurizio Lombardi <mlombard(a)redhat.com> ext4: missing unlock/put_page() in ext4_try_to_write_inline_data() Pan Bian <bianpan2016(a)163.com> ext4: fix possible use after free in ext4_quota_enable Ben Hutchings <ben(a)decadent.org.uk> perf pmu: Suppress potential format-truncation warning Miquel Raynal <miquel.raynal(a)bootlin.com> platform-msi: Free descriptors in platform_msi_domain_free() Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86: Use jmp to invoke kvm_spurious_fault() from .fixup Patrick Dreyer <Patrick(a)Dreyer.name> Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G Bjørn Mork <bjorn(a)mork.no> qmi_wwan: apply SET_DTR quirk to the SIMCOM shared device ID Colin Ian King <colin.king(a)canonical.com> staging: wilc1000: fix missing read_write setting when reading data Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable() Jörgen Storvist <jorgen.storvist(a)gmail.com> USB: serial: option: add Fibocom NL678 series Scott Chen <scott(a)labau.com.tw> USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays Sameer Pujar <spujar(a)nvidia.com> ALSA: hda/tegra: clear pending irq handlers Mantas Mikulėnas <grawity(a)gmail.com> ALSA: hda: add mute LED support for HP EliteBook 840 G4 Arnd Bergmann <arnd(a)arndb.de> mtd: atmel-quadspi: disallow building on ebsa110 Gustavo A. R. Silva <gustavo(a)embeddedor.com> ALSA: emux: Fix potential Spectre v1 vulnerabilities Gustavo A. R. Silva <gustavo(a)embeddedor.com> ALSA: pcm: Fix potential Spectre v1 vulnerability Gustavo A. R. Silva <gustavo(a)embeddedor.com> ALSA: emu10k1: Fix potential Spectre v1 vulnerabilities Gustavo A. R. Silva <gustavo(a)embeddedor.com> ALSA: rme9652: Fix potential Spectre v1 vulnerability Cong Wang <xiyou.wangcong(a)gmail.com> ptr_ring: wrap back ->producer in __ptr_ring_swap_queue() Deepa Dinamani <deepa.kernel(a)gmail.com> sock: Make sock->sk_stamp thread-safe Yuval Avnery <yuvalav(a)mellanox.com> net/mlx5: Typo fix in del_sw_hw_rule Alaa Hleihel <alaa(a)mellanox.com> net/mlx5e: Remove the false indication of software timestamping support Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com> gro_cell: add napi_disable in gro_cells_destroy Cong Wang <xiyou.wangcong(a)gmail.com> tipc: compare remote and local protocols in tipc_udp_enable() Cong Wang <xiyou.wangcong(a)gmail.com> tipc: use lock_sock() in tipc_sk_reinit() Juergen Gross <jgross(a)suse.com> xen/netfront: tolerate frags with no data Jorgen Hansen <jhansen(a)vmware.com> VSOCK: Send reset control packet when socket is partially bound Jason Wang <jasowang(a)redhat.com> vhost: make sure used idx is seen before log in vhost_add_used_n() Cong Wang <xiyou.wangcong(a)gmail.com> tipc: fix a double kfree_skb() Xin Long <lucien.xin(a)gmail.com> sctp: initialize sin6_flowinfo for ipv6 addrs in sctp_inet6addr_event Willem de Bruijn <willemb(a)google.com> packet: validate address length if non-zero Willem de Bruijn <willemb(a)google.com> packet: validate address length Cong Wang <xiyou.wangcong(a)gmail.com> net/wan: fix a double free in x25_asy_open_tty() Cong Wang <xiyou.wangcong(a)gmail.com> netrom: fix locking in nr_find_socket() Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> net: phy: Fix the issue that netif always links up after resuming Michal Kubecek <mkubecek(a)suse.cz> net: ipv4: do not handle duplicate fragments as overlapping Eric Dumazet <edumazet(a)google.com> isdn: fix kernel-infoleak in capi_unlocked_ioctl Eric Dumazet <edumazet(a)google.com> ipv6: tunnels: fix two use-after-free Cong Wang <xiyou.wangcong(a)gmail.com> ipv6: explicitly initialize udp6_addr in udp_sock_create6() Willem de Bruijn <willemb(a)google.com> ieee802154: lowpan_header_create check must check daddr Tyrel Datwyler <tyreld(a)linux.vnet.ibm.com> ibmveth: fix DMA unmap error in ibmveth_xmit_start error path Cong Wang <xiyou.wangcong(a)gmail.com> ax25: fix a use-after-free in ax25_fillin_cb() Gustavo A. R. Silva <gustavo(a)embeddedor.com> phonet: af_phonet: Fix Spectre v1 vulnerability Gustavo A. R. Silva <gustavo(a)embeddedor.com> net: core: Fix Spectre v1 vulnerability Gustavo A. R. Silva <gustavo(a)embeddedor.com> ipv4: Fix potential Spectre v1 vulnerability Gustavo A. R. Silva <gustavo(a)embeddedor.com> ip6mr: Fix potential Spectre v1 vulnerability Guenter Roeck <linux(a)roeck-us.net> NFC: nxp-nci: Include unaligned.h instead of access_ok.h ------------- Diffstat: Makefile | 4 +- arch/arm64/include/asm/kvm_arm.h | 2 +- arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 7 ++- arch/mips/cavium-octeon/executive/cvmx-helper.c | 3 +- arch/mips/include/asm/pgtable-64.h | 5 ++ arch/powerpc/kernel/signal_32.c | 20 ++++++- arch/powerpc/kernel/signal_64.c | 44 +++++++++----- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/vmx.c | 19 +++++- arch/x86/kvm/x86.c | 3 +- drivers/base/platform-msi.c | 6 +- drivers/char/tpm/tpm_i2c_nuvoton.c | 11 ++-- drivers/clk/rockchip/clk-rk3188.c | 2 +- drivers/input/mouse/elan_i2c_core.c | 1 + drivers/isdn/capi/kcapi.c | 4 +- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- drivers/media/platform/vivid/vivid-vid-cap.c | 2 + drivers/mtd/spi-nor/Kconfig | 2 +- drivers/net/ethernet/ibm/ibmveth.c | 6 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 +--- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- drivers/net/phy/phy_device.c | 7 +-- drivers/net/usb/qmi_wwan.c | 2 +- drivers/net/wan/x25_asy.c | 2 + drivers/net/xen-netfront.c | 2 +- drivers/nfc/nxp-nci/firmware.c | 2 +- drivers/nfc/nxp-nci/i2c.c | 2 +- drivers/rtc/rtc-m41t80.c | 2 +- drivers/spi/spi-bcm2835.c | 14 ++--- drivers/staging/wilc1000/wilc_sdio.c | 1 + drivers/tty/serial/xilinx_uartps.c | 4 +- drivers/usb/class/cdc-acm.c | 10 ++++ drivers/usb/class/cdc-acm.h | 1 + drivers/usb/host/r8a66597-hcd.c | 5 +- drivers/usb/serial/option.c | 4 ++ drivers/usb/serial/pl2303.c | 5 ++ drivers/usb/serial/pl2303.h | 5 ++ drivers/vhost/vhost.c | 2 + fs/btrfs/btrfs_inode.h | 6 ++ fs/btrfs/extent-tree.c | 4 ++ fs/btrfs/inode.c | 17 ++++++ fs/btrfs/tree-log.c | 16 ++++++ fs/cifs/smb2maperror.c | 4 +- fs/ext4/inline.c | 5 +- fs/ext4/inode.c | 9 ++- fs/ext4/resize.c | 2 +- fs/ext4/super.c | 13 ++++- fs/ext4/xattr.c | 2 +- fs/f2fs/super.c | 6 +- include/linux/msi.h | 2 + include/linux/ptr_ring.h | 2 + include/net/gro_cells.h | 1 + include/net/sock.h | 36 +++++++++++- include/trace/events/ext4.h | 20 +++++++ net/ax25/af_ax25.c | 11 +++- net/ax25/ax25_dev.c | 2 + net/compat.c | 15 +++-- net/core/filter.c | 2 + net/core/sock.c | 3 + net/ieee802154/6lowpan/tx.c | 3 + net/ipv4/ip_fragment.c | 18 ++++-- net/ipv4/ipmr.c | 3 + net/ipv6/ip6_tunnel.c | 1 + net/ipv6/ip6_udp_tunnel.c | 3 +- net/ipv6/ip6_vti.c | 1 + net/ipv6/ip6mr.c | 4 ++ net/netrom/af_netrom.c | 15 +++-- net/packet/af_packet.c | 8 ++- net/phonet/af_phonet.c | 3 + net/sctp/ipv6.c | 1 + net/sunrpc/svcsock.c | 2 +- net/tipc/socket.c | 8 ++- net/tipc/udp_media.c | 9 ++- net/vmw_vsock/vmci_transport.c | 67 ++++++++++++++++------ sound/core/pcm.c | 2 + sound/pci/emu10k1/emufx.c | 5 ++ sound/pci/hda/hda_tegra.c | 2 + sound/pci/hda/patch_conexant.c | 1 + sound/pci/rme9652/hdsp.c | 10 ++-- sound/synth/emux/emux_hwdep.c | 7 ++- tools/perf/util/pmu.c | 8 +-- 81 files changed, 451 insertions(+), 136 deletions(-)

6 years, 8 months

6
84
0 0

Path your photos?

by Jane

Do you have photos for editing? We asked this because we see your photos on your website. We mainly supply service for photos cut out , clipping path, and retouching. You may just send us a photo, we can provide you test editing to check quality. Thanks, Jane

6 years, 8 months

1
0
0 0

Path your photos?

by Jane

Do you have photos for editing? We asked this because we see your photos on your website. We mainly supply service for photos cut out , clipping path, and retouching. You may just send us a photo, we can provide you test editing to check quality. Thanks, Jane

6 years, 8 months

1
0
0 0

Enhancing the photos

by Jane

Do you have photos for editing? We asked this because we see your photos on your website. We mainly supply service for photos cut out , clipping path, and retouching. You may just send us a photo, we can provide you test editing to check quality. Thanks, Jane

6 years, 8 months

1
0
0 0

[PATCH] treewide: replace RETPOLINE with CONFIG_RETPOLINE

by WANG Chao

Since commit 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support"), RETPOLINE has been replaced by CONFIG_RETPOLINE. Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support") Signed-off-by: WANG Chao <chao.wang(a)ucloud.cn> --- arch/x86/kernel/cpu/bugs.c | 2 +- include/linux/compiler-gcc.h | 2 +- include/linux/module.h | 2 +- scripts/mod/modpost.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 500278f5308e..e8abe3f6c10e 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -213,7 +213,7 @@ static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init = static enum spectre_v2_user_mitigation spectre_v2_user __ro_after_init = SPECTRE_V2_USER_NONE; -#ifdef RETPOLINE +#ifdef CONFIG_RETPOLINE static bool spectre_v2_bad_module; bool retpoline_module_ok(bool has_retpoline) diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 2010493e1040..977ddf2774f9 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -68,7 +68,7 @@ */ #define uninitialized_var(x) x = x -#ifdef RETPOLINE +#ifdef CONFIG_RETPOLINE #define __noretpoline __attribute__((__indirect_branch__("keep"))) #endif diff --git a/include/linux/module.h b/include/linux/module.h index fce6b4335e36..0c575f51fe57 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -817,7 +817,7 @@ static inline void module_bug_finalize(const Elf_Ehdr *hdr, static inline void module_bug_cleanup(struct module *mod) {} #endif /* CONFIG_GENERIC_BUG */ -#ifdef RETPOLINE +#ifdef CONFIG_RETPOLINE extern bool retpoline_module_ok(bool has_retpoline); #else static inline bool retpoline_module_ok(bool has_retpoline) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 0d998c54564d..5a5b3780456f 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -2157,7 +2157,7 @@ static void add_intree_flag(struct buffer *b, int is_intree) /* Cannot check for assembler */ static void add_retpoline(struct buffer *b) { - buf_printf(b, "\n#ifdef RETPOLINE\n"); + buf_printf(b, "\n#ifdef CONFIG_RETPOLINE\n"); buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n"); buf_printf(b, "#endif\n"); } -- 2.19.2

6 years, 8 months

6
8
0 0

Enhancing the photos

by Jane

Do you have photos for editing? We asked this because we see your photos on your website. We mainly supply service for photos cut out , clipping path, and retouching. You may just send us a photo, we can provide you test editing to check quality. Thanks, Jane

6 years, 8 months

1
0
0 0

Send the photos?

by Helen

We see your photos photos for editing. Please send us the details of this task. Do your photos need cut out? Or clipping path, and retouching? You may give us 1 photo, we will do test for you to check the quality. Thanks, Helen

6 years, 8 months

1
0
0 0

[PATCH v1 for-rc] RDMA/vmw_pvrdma: Return the correct opcode when creating WR

by Adit Ranadive

From: Adit Ranadive <aditr(a)vmware.com> Since the IB_WR_REG_MR opcode value changed, let's set the PVRDMA device opcodes explicitly. Reported-by: Ruishuang Wang <ruishuangw(a)vmware.com> Fixes: 9a59739bd01f ("IB/rxe: Revise the ib_wr_opcode enum") Cc: stable(a)vger.kernel.org Reviewed-by: Bryan Tan <bryantan(a)vmware.com> Reviewed-by: Ruishuang Wang <ruishuangw(a)vmware.com> Reviewed-by: Vishnu Dasa <vdasa(a)vmware.com> Signed-off-by: Adit Ranadive <aditr(a)vmware.com> --- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h b/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h index 42b8685c997e..a85d7ba96d55 100644 --- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h +++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h @@ -427,6 +427,49 @@ static inline enum ib_qp_state pvrdma_qp_state_to_ib(enum pvrdma_qp_state state) static inline enum pvrdma_wr_opcode ib_wr_opcode_to_pvrdma(enum ib_wr_opcode op) { + switch (op) { + case IB_WR_RDMA_WRITE: + return PVRDMA_WR_RDMA_WRITE; + case IB_WR_RDMA_WRITE_WITH_IMM: + return PVRDMA_WR_RDMA_WRITE_WITH_IMM; + case IB_WR_SEND: + return PVRDMA_WR_SEND; + case IB_WR_SEND_WITH_IMM: + return PVRDMA_WR_SEND_WITH_IMM; + case IB_WR_RDMA_READ: + return PVRDMA_WR_RDMA_READ; + case IB_WR_ATOMIC_CMP_AND_SWP: + return PVRDMA_WR_ATOMIC_CMP_AND_SWP; + case IB_WR_ATOMIC_FETCH_AND_ADD: + return PVRDMA_WR_ATOMIC_FETCH_AND_ADD; + case IB_WR_LSO: + return PVRDMA_WR_LSO; + case IB_WR_SEND_WITH_INV: + return PVRDMA_WR_SEND_WITH_INV; + case IB_WR_RDMA_READ_WITH_INV: + return PVRDMA_WR_RDMA_READ_WITH_INV; + case IB_WR_LOCAL_INV: + return PVRDMA_WR_LOCAL_INV; + case IB_WR_REG_MR: + return PVRDMA_WR_FAST_REG_MR; + case IB_WR_MASKED_ATOMIC_CMP_AND_SWP: + return PVRDMA_WR_MASKED_ATOMIC_CMP_AND_SWP; + case IB_WR_MASKED_ATOMIC_FETCH_AND_ADD: + return PVRDMA_WR_MASKED_ATOMIC_FETCH_AND_ADD; + case IB_WR_REG_SIG_MR: + return PVRDMA_WR_REG_SIG_MR; + case IB_WR_RESERVED1: + case IB_WR_RESERVED2: + case IB_WR_RESERVED3: + case IB_WR_RESERVED4: + case IB_WR_RESERVED5: + case IB_WR_RESERVED6: + case IB_WR_RESERVED7: + case IB_WR_RESERVED8: + case IB_WR_RESERVED9: + case IB_WR_RESERVED10: + return (enum pvrdma_wr_opcode)op; + } return (enum pvrdma_wr_opcode)op; } -- 1.8.3.1

6 years, 8 months

3
5
0 0

[patch 11/14] mm: page_mapped: don't assume compound page is huge or THP

by akpm＠linux-foundation.org

From: Jan Stancek <jstancek(a)redhat.com> Subject: mm: page_mapped: don't assume compound page is huge or THP LTP proc01 testcase has been observed to rarely trigger crashes on arm64: page_mapped+0x78/0xb4 stable_page_flags+0x27c/0x338 kpageflags_read+0xfc/0x164 proc_reg_read+0x7c/0xb8 __vfs_read+0x58/0x178 vfs_read+0x90/0x14c SyS_read+0x60/0xc0 Issue is that page_mapped() assumes that if compound page is not huge, then it must be THP. But if this is 'normal' compound page (COMPOUND_PAGE_DTOR), then following loop can keep running (for HPAGE_PMD_NR iterations) until it tries to read from memory that isn't mapped and triggers a panic: for (i = 0; i < hpage_nr_pages(page); i++) { if (atomic_read(&page[i]._mapcount) >= 0) return true; } I could replicate this on x86 (v4.20-rc4-98-g60b548237fed) only with a custom kernel module [1] which: - allocates compound page (PAGEC) of order 1 - allocates 2 normal pages (COPY), which are initialized to 0xff (to satisfy _mapcount >= 0) - 2 PAGEC page structs are copied to address of first COPY page - second page of COPY is marked as not present - call to page_mapped(COPY) now triggers fault on access to 2nd COPY page at offset 0x30 (_mapcount) [1] https://github.com/jstancek/reproducers/blob/master/kernel/page_mapped_cras… Fix the loop to iterate for "1 << compound_order" pages. Kirrill said "IIRC, sound subsystem can producuce custom mapped compound pages". Link: http://lkml.kernel.org/r/c440d69879e34209feba21e12d236d06bc0a25db.154357715… Fixes: e1534ae95004 ("mm: differentiate page_mapped() from page_mapcount() for compound pages") Signed-off-by: Jan Stancek <jstancek(a)redhat.com> Debugged-by: Laszlo Ersek <lersek(a)redhat.com> Suggested-by: "Kirill A. Shutemov" <kirill(a)shutemov.name> Acked-by: Michal Hocko <mhocko(a)suse.com> Acked-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Reviewed-by: David Hildenbrand <david(a)redhat.com> Reviewed-by: Andrea Arcangeli <aarcange(a)redhat.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/util.c~mm-page_mapped-dont-assume-compound-page-is-huge-or-thp +++ a/mm/util.c @@ -478,7 +478,7 @@ bool page_mapped(struct page *page) return true; if (PageHuge(page)) return false; - for (i = 0; i < hpage_nr_pages(page); i++) { + for (i = 0; i < (1 << compound_order(page)); i++) { if (atomic_read(&page[i]._mapcount) >= 0) return true; } _

6 years, 8 months

1
0
0 0

[patch 05/14] mm, memcg: fix reclaim deadlock with writeback

by akpm＠linux-foundation.org

From: Michal Hocko <mhocko(a)suse.com> Subject: mm, memcg: fix reclaim deadlock with writeback Liu Bo has experienced a deadlock between memcg (legacy) reclaim and the ext4 writeback task1: [<ffffffff811aaa52>] wait_on_page_bit+0x82/0xa0 [<ffffffff811c5777>] shrink_page_list+0x907/0x960 [<ffffffff811c6027>] shrink_inactive_list+0x2c7/0x680 [<ffffffff811c6ba4>] shrink_node_memcg+0x404/0x830 [<ffffffff811c70a8>] shrink_node+0xd8/0x300 [<ffffffff811c73dd>] do_try_to_free_pages+0x10d/0x330 [<ffffffff811c7865>] try_to_free_mem_cgroup_pages+0xd5/0x1b0 [<ffffffff8122df2d>] try_charge+0x14d/0x720 [<ffffffff812320cc>] memcg_kmem_charge_memcg+0x3c/0xa0 [<ffffffff812321ae>] memcg_kmem_charge+0x7e/0xd0 [<ffffffff811b68a8>] __alloc_pages_nodemask+0x178/0x260 [<ffffffff8120bff5>] alloc_pages_current+0x95/0x140 [<ffffffff81074247>] pte_alloc_one+0x17/0x40 [<ffffffff811e34de>] __pte_alloc+0x1e/0x110 [<ffffffffa06739de>] alloc_set_pte+0x5fe/0xc20 [<ffffffff811e5d93>] do_fault+0x103/0x970 [<ffffffff811e6e5e>] handle_mm_fault+0x61e/0xd10 [<ffffffff8106ea02>] __do_page_fault+0x252/0x4d0 [<ffffffff8106ecb0>] do_page_fault+0x30/0x80 [<ffffffff8171bce8>] page_fault+0x28/0x30 [<ffffffffffffffff>] 0xffffffffffffffff task2: [<ffffffff811aadc6>] __lock_page+0x86/0xa0 [<ffffffffa02f1e47>] mpage_prepare_extent_to_map+0x2e7/0x310 [ext4] [<ffffffffa08a2689>] ext4_writepages+0x479/0xd60 [<ffffffff811bbede>] do_writepages+0x1e/0x30 [<ffffffff812725e5>] __writeback_single_inode+0x45/0x320 [<ffffffff81272de2>] writeback_sb_inodes+0x272/0x600 [<ffffffff81273202>] __writeback_inodes_wb+0x92/0xc0 [<ffffffff81273568>] wb_writeback+0x268/0x300 [<ffffffff81273d24>] wb_workfn+0xb4/0x390 [<ffffffff810a2f19>] process_one_work+0x189/0x420 [<ffffffff810a31fe>] worker_thread+0x4e/0x4b0 [<ffffffff810a9786>] kthread+0xe6/0x100 [<ffffffff8171a9a1>] ret_from_fork+0x41/0x50 [<ffffffffffffffff>] 0xffffffffffffffff He adds : task1 is waiting for the PageWriteback bit of the page that task2 has : collected in mpd->io_submit->io_bio, and tasks2 is waiting for the LOCKED : bit the page which tasks1 has locked. More precisely task1 is handling a page fault and it has a page locked while it charges a new page table to a memcg. That in turn hits a memory limit reclaim and the memcg reclaim for legacy controller is waiting on the writeback but that is never going to finish because the writeback itself is waiting for the page locked in the #PF path. So this is essentially ABBA deadlock: lock_page(A) SetPageWriteback(A) unlock_page(A) lock_page(B) lock_page(B) pte_alloc_pne shrink_page_list wait_on_page_writeback(A) SetPageWriteback(B) unlock_page(B) # flush A, B to clear the writeback This accumulating of more pages to flush is used by several filesystems to generate a more optimal IO patterns. Waiting for the writeback in legacy memcg controller is a workaround for pre-mature OOM killer invocations because there is no dirty IO throttling available for the controller. There is no easy way around that unfortunately. Therefore fix this specific issue by pre-allocating the page table outside of the page lock. We have that handy infrastructure for that already so simply reuse the fault-around pattern which already does this. There are probably other hidden __GFP_ACCOUNT | GFP_KERNEL allocations from under a fs page locked but they should be really rare. I am not aware of a better solution unfortunately. [akpm(a)linux-foundation.org: fix mm/memory.c:__do_fault()] [akpm(a)linux-foundation.org: coding-style fixes] [mhocko(a)kernel.org: enhance comment, per Johannes] Link: http://lkml.kernel.org/r/20181214084948.GA5624@dhcp22.suse.cz Link: http://lkml.kernel.org/r/20181213092221.27270-1-mhocko@kernel.org Fixes: c3b94f44fcb0 ("memcg: further prevent OOM with too many dirty pages") Signed-off-by: Michal Hocko <mhocko(a)suse.com> Reported-by: Liu Bo <bo.liu(a)linux.alibaba.com> Debugged-by: Liu Bo <bo.liu(a)linux.alibaba.com> Acked-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Acked-by: Johannes Weiner <hannes(a)cmpxchg.org> Reviewed-by: Liu Bo <bo.liu(a)linux.alibaba.com> Cc: Jan Kara <jack(a)suse.cz> Cc: Dave Chinner <david(a)fromorbit.com> Cc: Theodore Ts'o <tytso(a)mit.edu> Cc: Vladimir Davydov <vdavydov.dev(a)gmail.com> Cc: Shakeel Butt <shakeelb(a)google.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/memory.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) --- a/mm/memory.c~mm-memcg-fix-reclaim-deadlock-with-writeback +++ a/mm/memory.c @@ -2994,6 +2994,28 @@ static vm_fault_t __do_fault(struct vm_f struct vm_area_struct *vma = vmf->vma; vm_fault_t ret; + /* + * Preallocate pte before we take page_lock because this might lead to + * deadlocks for memcg reclaim which waits for pages under writeback: + * lock_page(A) + * SetPageWriteback(A) + * unlock_page(A) + * lock_page(B) + * lock_page(B) + * pte_alloc_pne + * shrink_page_list + * wait_on_page_writeback(A) + * SetPageWriteback(B) + * unlock_page(B) + * # flush A, B to clear the writeback + */ + if (pmd_none(*vmf->pmd) && !vmf->prealloc_pte) { + vmf->prealloc_pte = pte_alloc_one(vmf->vma->vm_mm); + if (!vmf->prealloc_pte) + return VM_FAULT_OOM; + smp_wmb(); /* See comment in __pte_alloc() */ + } + ret = vma->vm_ops->fault(vmf); if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY | VM_FAULT_DONE_COW))) _

6 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror