From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754000AbbGXOqB (ORCPT ); Fri, 24 Jul 2015 10:46:01 -0400 Received: from mx2.suse.de ([195.135.220.15]:49385 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751027AbbGXOp4 (ORCPT ); Fri, 24 Jul 2015 10:45:56 -0400 From: Vlastimil Babka To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Andrew Morton , Mel Gorman , David Rientjes , Greg Thelen , "Aneesh Kumar K.V" , Christoph Lameter , Pekka Enberg , Joonsoo Kim , Naoya Horiguchi , Vlastimil Babka Subject: [RFC v2 4/4] mm: fallback for offline nodes in alloc_pages_node Date: Fri, 24 Jul 2015 16:45:26 +0200 Message-Id: <1437749126-25867-4-git-send-email-vbabka@suse.cz> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1437749126-25867-1-git-send-email-vbabka@suse.cz> References: <1437749126-25867-1-git-send-email-vbabka@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org alloc_pages_node() now warns when an offline node is passed. Make it fallback to the local (or nearest) node as if NUMA_NO_NODE nid is passed, but keep the VM_WARN_ON warning. Suggested-by: David Rientjes Signed-off-by: Vlastimil Babka --- David's suggested if(VM_WARN_ON(...)) doesn't work that way, hence this more involved and awkward syntax. include/linux/gfp.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 531c72d..104a027 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -321,8 +321,12 @@ static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order) { /* Unknown node is current (or closest) node */ - if (nid == NUMA_NO_NODE) + if (nid == NUMA_NO_NODE) { nid = numa_mem_id(); + } else if (!node_online(nid)) { + VM_WARN_ON(!node_online(nid)); + nid = numa_mem_id(); + } return __alloc_pages_node(nid, gfp_mask, order); } -- 2.4.6 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by kanga.kvack.org (Postfix) with ESMTP id 4FC716B0254 for ; Fri, 24 Jul 2015 10:46:01 -0400 (EDT) Received: by lblf12 with SMTP id f12so16699251lbl.2 for ; Fri, 24 Jul 2015 07:46:00 -0700 (PDT) Received: from mx2.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id bc2si1383619wib.87.2015.07.24.07.45.55 for (version=TLS1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Jul 2015 07:45:56 -0700 (PDT) From: Vlastimil Babka Subject: [RFC v2 4/4] mm: fallback for offline nodes in alloc_pages_node Date: Fri, 24 Jul 2015 16:45:26 +0200 Message-Id: <1437749126-25867-4-git-send-email-vbabka@suse.cz> In-Reply-To: <1437749126-25867-1-git-send-email-vbabka@suse.cz> References: <1437749126-25867-1-git-send-email-vbabka@suse.cz> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Andrew Morton , Mel Gorman , David Rientjes , Greg Thelen , "Aneesh Kumar K.V" , Christoph Lameter , Pekka Enberg , Joonsoo Kim , Naoya Horiguchi , Vlastimil Babka alloc_pages_node() now warns when an offline node is passed. Make it fallback to the local (or nearest) node as if NUMA_NO_NODE nid is passed, but keep the VM_WARN_ON warning. Suggested-by: David Rientjes Signed-off-by: Vlastimil Babka --- David's suggested if(VM_WARN_ON(...)) doesn't work that way, hence this more involved and awkward syntax. include/linux/gfp.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 531c72d..104a027 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -321,8 +321,12 @@ static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order) { /* Unknown node is current (or closest) node */ - if (nid == NUMA_NO_NODE) + if (nid == NUMA_NO_NODE) { nid = numa_mem_id(); + } else if (!node_online(nid)) { + VM_WARN_ON(!node_online(nid)); + nid = numa_mem_id(); + } return __alloc_pages_node(nid, gfp_mask, order); } -- 2.4.6 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org