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); }