From patchwork Fri Feb 21 04:04:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 231051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E297AC11D27 for ; Fri, 21 Feb 2020 04:04:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B00E124656 for ; Fri, 21 Feb 2020 04:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582257859; bh=5mIJtpI46Oskh+IAg3n6Md+XF3NXccWhtLrcbhRYqA4=; h=Date:From:To:Subject:List-ID:From; b=dSSF4OEjoG3pxRnpok4UYgtGb+eC97c3m0xt4q14RGyeAikzUS02ImWXJzpSKVerd CJHeLp4RsTfvkD67Gn/bIQb/MAFOGtPjNoNueRVqUZVhgIiCku23rdq0es0T34C28H SyhSnLUJdwr8LWnh9zo61VKsHCeHLxOsCDaFR7mQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729608AbgBUEET (ORCPT ); Thu, 20 Feb 2020 23:04:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:35166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729229AbgBUEET (ORCPT ); Thu, 20 Feb 2020 23:04:19 -0500 Received: from X1 (nat-ab2241.sltdut.senawave.net [162.218.216.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 885ED207FD; Fri, 21 Feb 2020 04:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582257858; bh=5mIJtpI46Oskh+IAg3n6Md+XF3NXccWhtLrcbhRYqA4=; h=Date:From:To:Subject:From; b=0zeqLBsCRyDrz7bAiso+vKVtSmiepm/FEsHxRBYVsxbF1nLT+DrrhW1UDKS45e3XF B2g+MqmgHjvCnwe/fSkqEtOE31pBrkEFzh1pOKYCcybhmBGALKAvfE1zCedeLZQ+9n 3U5rDY/gQH83qQt/nQ9nysgdocwlAetviuhymHV0= Date: Thu, 20 Feb 2020 20:04:18 -0800 From: akpm@linux-foundation.org To: vdavydov.dev@gmail.com, stable@vger.kernel.org, mhocko@suse.com, ktkhai@virtuozzo.com, hannes@cmpxchg.org, guro@fb.com, vvs@virtuozzo.com, akpm@linux-foundation.org, mm-commits@vger.kernel.org, linux-mm@kvack.org, torvalds@linux-foundation.org Subject: [patch 10/15] mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps() Message-ID: <20200221040418.LZDCt%akpm@linux-foundation.org> User-Agent: s-nail v14.9.10 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vasily Averin Subject: mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps() for_each_mem_cgroup() increases css reference counter for memory cgroup and requires to use mem_cgroup_iter_break() if the walk is cancelled. Link: http://lkml.kernel.org/r/c98414fb-7e1f-da0f-867a-9340ec4bd30b@virtuozzo.com Fixes: 0a4465d34028 ("mm, memcg: assign memcg-aware shrinkers bitmap to memcg") Signed-off-by: Vasily Averin Acked-by: Kirill Tkhai Acked-by: Michal Hocko Reviewed-by: Roman Gushchin Cc: Johannes Weiner Cc: Vladimir Davydov Cc: Signed-off-by: Andrew Morton --- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/mm/memcontrol.c~memcg-lost-css_put-in-memcg_expand_shrinker_maps +++ a/mm/memcontrol.c @@ -409,8 +409,10 @@ int memcg_expand_shrinker_maps(int new_i if (mem_cgroup_is_root(memcg)) continue; ret = memcg_expand_one_shrinker_map(memcg, size, old_size); - if (ret) + if (ret) { + mem_cgroup_iter_break(NULL, memcg); goto unlock; + } } unlock: if (!ret) From patchwork Fri Feb 21 04:04:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 231050 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 108B2C11D27 for ; Fri, 21 Feb 2020 04:04:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC08F222C4 for ; Fri, 21 Feb 2020 04:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582257870; bh=s8QcWSHLHYF5XEjGe2UFKKpf61gtz6fqwnNP0WKUEGo=; h=Date:From:To:Subject:List-ID:From; b=BLP8v0mGUlXnS8oHk+/+ZEIKjoIrGwE8lkAn0a/i0EABaw/GWpjH0kx+zXsItjjWL w0CYEUJ9z1PQH7eLQ7EfUlWF9b+mboa7DSLTgKSVVYO30v4xFj+CeNGXySsc3o/CWd 4GEpRAxRs2zreixDYe0LJD3irsjkED/2tjDvUn64= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729615AbgBUEEa (ORCPT ); Thu, 20 Feb 2020 23:04:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:35346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729229AbgBUEEa (ORCPT ); Thu, 20 Feb 2020 23:04:30 -0500 Received: from X1 (nat-ab2241.sltdut.senawave.net [162.218.216.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 61D14207FD; Fri, 21 Feb 2020 04:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582257867; bh=s8QcWSHLHYF5XEjGe2UFKKpf61gtz6fqwnNP0WKUEGo=; h=Date:From:To:Subject:From; b=OVQZhBa/0Qy3e7lE2VGJDautqY2klJuOAqzkcmEDALtwYxE0X+8oIKGqyJzby3zAO 1v+2r9A3jJRLe8RrWjk6CyAzmjaTCa3kSHM+SiaVvllW55meWm8tWagd9e6GtvzdaK ustSbwv4RaFHnBX7nr5ZAi3DsoQ64gVqSPw8K+uE= Date: Thu, 20 Feb 2020 20:04:27 -0800 From: akpm@linux-foundation.org To: stable@vger.kernel.org, rppt@linux.ibm.com, osalvador@suse.de, mhocko@suse.com, david@redhat.com, dan.j.williams@intel.com, bhe@redhat.com, richardw.yang@linux.intel.com, akpm@linux-foundation.org, mm-commits@vger.kernel.org, linux-mm@kvack.org, torvalds@linux-foundation.org Subject: [patch 13/15] mm/sparsemem: pfn_to_page is not valid yet on SPARSEMEM Message-ID: <20200221040427.CaHub%akpm@linux-foundation.org> User-Agent: s-nail v14.9.10 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wei Yang Subject: mm/sparsemem: pfn_to_page is not valid yet on SPARSEMEM When we use SPARSEMEM instead of SPARSEMEM_VMEMMAP, pfn_to_page() doesn't work before sparse_init_one_section() is called. This leads to a crash when hotplug memory: [ 41.839170] BUG: unable to handle page fault for address: 0000000006400000 [ 41.840663] #PF: supervisor write access in kernel mode [ 41.841822] #PF: error_code(0x0002) - not-present page [ 41.842970] PGD 0 P4D 0 [ 41.843538] Oops: 0002 [#1] SMP PTI [ 41.844125] CPU: 3 PID: 221 Comm: kworker/u16:1 Tainted: G W 5.5.0-next-20200205+ #343 [ 41.845659] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 0.0.0 02/06/2015 [ 41.846977] Workqueue: kacpi_hotplug acpi_hotplug_work_fn [ 41.847904] RIP: 0010:__memset+0x24/0x30 [ 41.848660] Code: cc cc cc cc cc cc 0f 1f 44 00 00 49 89 f9 48 89 d1 83 e2 07 48 c1 e9 03 40 0f b6 f6 48 b8 01 01 01 01 01 01 01 01 48 0f af c6 48 ab 89 d1 f3 aa 4c 89 c8 c3 90 49 89 f9 40 88 f0 48 89 d1 f3 [ 41.851836] RSP: 0018:ffffb43ac0373c80 EFLAGS: 00010a87 [ 41.852686] RAX: ffffffffffffffff RBX: ffff8a1518800000 RCX: 0000000000050000 [ 41.853824] RDX: 0000000000000000 RSI: 00000000000000ff RDI: 0000000006400000 [ 41.854967] RBP: 0000000000140000 R08: 0000000000100000 R09: 0000000006400000 [ 41.856107] R10: 0000000000000000 R11: 0000000000000002 R12: 0000000000000000 [ 41.857255] R13: 0000000000000028 R14: 0000000000000000 R15: ffff8a153ffd9280 [ 41.858414] FS: 0000000000000000(0000) GS:ffff8a153ab00000(0000) knlGS:0000000000000000 [ 41.859703] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 41.860627] CR2: 0000000006400000 CR3: 0000000136fca000 CR4: 00000000000006e0 [ 41.861716] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 41.862680] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 41.863628] Call Trace: [ 41.863983] sparse_add_section+0x1c9/0x26a [ 41.864570] __add_pages+0xbf/0x150 [ 41.865057] add_pages+0x12/0x60 [ 41.865489] add_memory_resource+0xc8/0x210 [ 41.866017] ? wake_up_q+0xa0/0xa0 [ 41.866416] __add_memory+0x62/0xb0 [ 41.866825] acpi_memory_device_add+0x13f/0x300 [ 41.867410] acpi_bus_attach+0xf6/0x200 [ 41.867890] acpi_bus_scan+0x43/0x90 [ 41.868448] acpi_device_hotplug+0x275/0x3d0 [ 41.868972] acpi_hotplug_work_fn+0x1a/0x30 [ 41.869473] process_one_work+0x1a7/0x370 [ 41.869953] worker_thread+0x30/0x380 [ 41.870396] ? flush_rcu_work+0x30/0x30 [ 41.870846] kthread+0x112/0x130 [ 41.871236] ? kthread_create_on_node+0x60/0x60 [ 41.871770] ret_from_fork+0x35/0x40 We should use memmap as it did. On x86 the impact is limited to x86_32 builds, or x86_64 configurations that override the default setting for SPARSEMEM_VMEMMAP. Other memory hotplug archs (arm64, ia64, and ppc) also default to SPARSEMEM_VMEMMAP=y. [dan.j.williams@intel.com: changelog update] {rppt@linux.ibm.com: changelog update] Link: http://lkml.kernel.org/r/20200219030454.4844-1-bhe@redhat.com Fixes: ba72b4c8cf60 ("mm/sparsemem: support sub-section hotplug") Signed-off-by: Wei Yang Signed-off-by: Baoquan He Acked-by: David Hildenbrand Reviewed-by: Baoquan He Reviewed-by: Dan Williams Acked-by: Michal Hocko Cc: Mike Rapoport Cc: Oscar Salvador Cc: Signed-off-by: Andrew Morton --- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/sparse.c~mm-sparsemem-pfn_to_page-is-not-valid-yet-on-sparsemem +++ a/mm/sparse.c @@ -876,7 +876,7 @@ int __meminit sparse_add_section(int nid * Poison uninitialized struct pages in order to catch invalid flags * combinations. */ - page_init_poison(pfn_to_page(start_pfn), sizeof(struct page) * nr_pages); + page_init_poison(memmap, sizeof(struct page) * nr_pages); ms = __nr_to_section(section_nr); set_section_nid(section_nr, nid);