From patchwork Mon Dec 6 03:33:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 12657643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACD4EC433F5 for ; Mon, 6 Dec 2021 03:34:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EBCFA6B007D; Sun, 5 Dec 2021 22:34:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E6B876B007E; Sun, 5 Dec 2021 22:34:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D335F6B0080; Sun, 5 Dec 2021 22:34:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id C471D6B007D for ; Sun, 5 Dec 2021 22:34:44 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8C89118106137 for ; Mon, 6 Dec 2021 03:34:34 +0000 (UTC) X-FDA: 78885952068.07.EB13BAE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 648A2900013E for ; Mon, 6 Dec 2021 03:34:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638761673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gDEbARRsqM2o01c5H85NSuz9lyNx5JpTLejFQo2L414=; b=FLP+pv4jRQz+64YuVKb5xcUA8nOLwbGZYsDQiolRa4kn8/XE5RmFwObwAFK6Yfi8zpX+Qv K4M/HVwSoMm79LKD/xg1a1ao9GEzocSIkV6n5SQZSOsv3jjFyLPl+iGdTmVzfnJNPm/wVW l7us5Iu29jTvnnn96SDG+z0wYb4wOt0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-104-OIryR0B9O46NBJaoc2Ei1Q-1; Sun, 05 Dec 2021 22:34:30 -0500 X-MC-Unique: OIryR0B9O46NBJaoc2Ei1Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1FA7B100CCC1; Mon, 6 Dec 2021 03:34:29 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.16.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 667C61B472; Mon, 6 Dec 2021 03:34:24 +0000 (UTC) From: Nico Pache To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org Cc: shakeelb@google.com, ktkhai@virtuozzo.com, shy828301@gmail.com, guro@fb.com, vbabka@suse.cz, vdavydov.dev@gmail.com, raquini@redhat.com, Rafael Aquini Subject: [RFC PATCH 1/2] include/linux/gfp.h: Do not allocate pages on a offlined node Date: Sun, 5 Dec 2021 22:33:37 -0500 Message-Id: <20211206033338.743270-2-npache@redhat.com> In-Reply-To: <20211206033338.743270-1-npache@redhat.com> References: <20211206033338.743270-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 648A2900013E X-Stat-Signature: 7zn71t1gx5nphe1io3jpoidcbnshawgn Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FLP+pv4j; spf=none (imf29.hostedemail.com: domain of npache@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1638761671-937613 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: We shouldn't allocate pages on a unavailable node. Add a check for this in __alloc_pages_node and return NULL to avoid issues further down the callchain. Also update the VM_WARN_ON in __alloc_pages_node which could skip this warn if the gfp_mask is not GFP_THISNODE. Co-developed-by: Rafael Aquini Signed-off-by: Nico Pache --- include/linux/gfp.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index b976c4177299..e7e18f6d0d9d 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -565,7 +565,10 @@ static inline struct page * __alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order) { VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES); - VM_WARN_ON((gfp_mask & __GFP_THISNODE) && !node_online(nid)); + VM_WARN_ON(!node_online(nid)); + + if (!node_online(nid)) + return NULL; return __alloc_pages(gfp_mask, order, nid, NULL); } From patchwork Mon Dec 6 03:33:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 12657645 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F781C433EF for ; Mon, 6 Dec 2021 03:35:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B3CC6B007E; Sun, 5 Dec 2021 22:34:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 962B46B0080; Sun, 5 Dec 2021 22:34:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 829D76B0081; Sun, 5 Dec 2021 22:34:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0140.hostedemail.com [216.40.44.140]) by kanga.kvack.org (Postfix) with ESMTP id 731906B007E for ; Sun, 5 Dec 2021 22:34:53 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 326B88249980 for ; Mon, 6 Dec 2021 03:34:43 +0000 (UTC) X-FDA: 78885952446.11.A774FA5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id C32A0B00009D for ; Mon, 6 Dec 2021 03:34:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638761682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kHcZ4LUc5tD1QYK+8oGSZ7WM0x+4I9RIakYH3yFI7AQ=; b=FA2+4yjKJ5kSst0r7RB6fsNno1Pt4k/fs1dNtlrLSA5iwUfIoOpmZ6tv0i0ZHPPnyvdVOa hkJ/IECVDpubD/muEGwRl8MCdrxcvIfEsKT8rDPpHUBPZWS+AEj7Mow/jNFTnXBQy7X0sM Gdwkrktk1eQzGf9bdzaVYRpXFTTCQ90= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-343-zRGYNl1NOqOpfk-hrXTYzA-1; Sun, 05 Dec 2021 22:34:39 -0500 X-MC-Unique: zRGYNl1NOqOpfk-hrXTYzA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7EF7A8042E1; Mon, 6 Dec 2021 03:34:37 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.16.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50D655BAE2; Mon, 6 Dec 2021 03:34:31 +0000 (UTC) From: Nico Pache To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org Cc: shakeelb@google.com, ktkhai@virtuozzo.com, shy828301@gmail.com, guro@fb.com, vbabka@suse.cz, vdavydov.dev@gmail.com, raquini@redhat.com Subject: [RFC PATCH 2/2] mm/vmscan.c: Prevent allocating shrinker_info on offlined nodes Date: Sun, 5 Dec 2021 22:33:38 -0500 Message-Id: <20211206033338.743270-3-npache@redhat.com> In-Reply-To: <20211206033338.743270-1-npache@redhat.com> References: <20211206033338.743270-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: C32A0B00009D X-Stat-Signature: 9j35h55gshb7i6xpd7knx3m38ismeufh Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FA2+4yjK; spf=none (imf19.hostedemail.com: domain of npache@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1638761682-132330 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: We have run into a panic caused by a shrinker allocation being attempted on an offlined node. Our crash analysis has determined that the issue originates from trying to allocate pages on an offlined node in expand_one_shrinker_info. This function makes the incorrect assumption that we can allocate on any node. To correct this we make sure we only itterate over online nodes. This assumption can lead to an incorrect address being assigned to ac->zonelist in the following callchain: __alloc_pages -> prepare_alloc_pages -> node_zonelist static inline struct zonelist *node_zonelist(int nid, gfp_t flags) { return NODE_DATA(nid)->node_zonelists + gfp_zonelist(flags); } if the node is not online the return of node_zonelist will evaluate to a invalid pointer of 0x00000 + offset_of(node_zonelists) + (1|0) This address is then dereferenced further down the callchain in: prepare_alloc_pages -> first_zones_zonelist -> next_zones_zonelist -> zonelist_zone_idx static inline int zonelist_zone_idx(struct zoneref *zoneref) { return zoneref->zone_idx; } Leading the system to panic. We also correct this behavior in alloc_shrinker_info, free_shrinker_info, and reparent_shrinker_deferred. Fixes: 2bfd36374edd ("mm: vmscan: consolidate shrinker_maps handling code") Fixes: 0a4465d34028 ("mm, memcg: assign memcg-aware shrinkers bitmap to memcg") Signed-off-by: Nico Pache --- mm/vmscan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index fb9584641ac7..731564b61e3f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -221,7 +221,7 @@ static int expand_one_shrinker_info(struct mem_cgroup *memcg, int nid; int size = map_size + defer_size; - for_each_node(nid) { + for_each_online_node(nid) { pn = memcg->nodeinfo[nid]; old = shrinker_info_protected(memcg, nid); /* Not yet online memcg */ @@ -256,7 +256,7 @@ void free_shrinker_info(struct mem_cgroup *memcg) struct shrinker_info *info; int nid; - for_each_node(nid) { + for_each_online_node(nid) { pn = memcg->nodeinfo[nid]; info = rcu_dereference_protected(pn->shrinker_info, true); kvfree(info); @@ -274,7 +274,7 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) map_size = shrinker_map_size(shrinker_nr_max); defer_size = shrinker_defer_size(shrinker_nr_max); size = map_size + defer_size; - for_each_node(nid) { + for_each_online_node(nid) { info = kvzalloc_node(sizeof(*info) + size, GFP_KERNEL, nid); if (!info) { free_shrinker_info(memcg); @@ -417,7 +417,7 @@ void reparent_shrinker_deferred(struct mem_cgroup *memcg) /* Prevent from concurrent shrinker_info expand */ down_read(&shrinker_rwsem); - for_each_node(nid) { + for_each_online_node(nid) { child_info = shrinker_info_protected(memcg, nid); parent_info = shrinker_info_protected(parent, nid); for (i = 0; i < shrinker_nr_max; i++) {