From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DF5EC433FE for ; Mon, 1 Nov 2021 20:39:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7E20060F0F for ; Mon, 1 Nov 2021 20:39:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7E20060F0F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id D2CFA6B00BC; Mon, 1 Nov 2021 16:39:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CB4A66B00BD; Mon, 1 Nov 2021 16:39:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7BD06B00BE; Mon, 1 Nov 2021 16:39:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0083.hostedemail.com [216.40.44.83]) by kanga.kvack.org (Postfix) with ESMTP id A4EC56B00BC for ; Mon, 1 Nov 2021 16:39:52 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 2EF9956779 for ; Mon, 1 Nov 2021 20:39:52 +0000 (UTC) X-FDA: 78761527824.02.7A4922C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id 7A37DF0000AF for ; Mon, 1 Nov 2021 20:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=GDo38ocU3pLClKl3wyVO90VvxmLoO3CeEoE5GEzkERk=; b=RyJbRA3f+AsVJo0k56Bz2l/1Sy hrFjNtQEliiW2GQnf+kHW3bKSW85yzuT9LHZ52az81pke0WekzAxASXhQ7RlasjSXl+KkXHnDebAS U02xF4K1cDk5Mdc360fo498yuNvtnmtzMKihBll2bFbQXlzvFRLleNsjipEu1a7NascW/LH5i7e2o 0y/dPIhJkV2bfvriOV9Eu+d3U6Wa3Lq5ynVnq1lZgG7hNEAqRAlWF3E+bY6n/GPyRueE0eLm8elg6 7pjQJQerALpUp2VCDs9kGix/k56KtzlMH4+hwsFkz4A5r7MOsqNjThluY4iO8HmgTxNBrjZF1ktlO /hdgGrkw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mhe4Q-0040Ih-AQ; Mon, 01 Nov 2021 20:38:45 +0000 Date: Mon, 1 Nov 2021 20:38:18 +0000 From: Matthew Wilcox To: Alexey Makhalov Cc: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] mm: fix panic in __alloc_pages Message-ID: References: <20211101201312.11589-1-amakhalov@vmware.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211101201312.11589-1-amakhalov@vmware.com> X-Rspamd-Queue-Id: 7A37DF0000AF X-Stat-Signature: jgco65ygco91qmrefso1bbfnpztfw6ps Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=RyJbRA3f; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam02 X-HE-Tag: 1635799191-819351 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: On Mon, Nov 01, 2021 at 01:13:12PM -0700, Alexey Makhalov wrote: > +++ b/include/linux/gfp.h > @@ -551,7 +551,8 @@ alloc_pages_bulk_array(gfp_t gfp, unsigned long nr_pages, struct page **page_arr > static inline unsigned long > alloc_pages_bulk_array_node(gfp_t gfp, int nid, unsigned long nr_pages, struct page **page_array) > { > - if (nid == NUMA_NO_NODE) > + if (nid == NUMA_NO_NODE || (!node_online(nid) && > + !(gfp & __GFP_THISNODE))) > nid = numa_mem_id(); > > return __alloc_pages_bulk(gfp, nid, NULL, nr_pages, NULL, page_array); I don't think it's a great idea to push node_online() and the gfp check into the caller. Can't we put this check in __alloc_pages_bulk() instead?