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 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=3.0 tests=MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham 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 18BFEC43142 for ; Thu, 2 Aug 2018 07:31:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9EBB20C0A for ; Thu, 2 Aug 2018 07:31:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9EBB20C0A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727116AbeHBJVl (ORCPT ); Thu, 2 Aug 2018 05:21:41 -0400 Received: from mx2.suse.de ([195.135.220.15]:50168 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726237AbeHBJVl (ORCPT ); Thu, 2 Aug 2018 05:21:41 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 08CAFAE2D; Thu, 2 Aug 2018 07:31:49 +0000 (UTC) Date: Thu, 2 Aug 2018 09:31:47 +0200 From: Michal Hocko To: Jeremy Linton Cc: linux-mm@kvack.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz, Punit.Agrawal@arm.com, Lorenzo.Pieralisi@arm.com, linux-arm-kernel@lists.infradead.org, bhelgaas@google.com, linux-kernel@vger.kernel.org Subject: Re: [RFC 2/2] mm: harden alloc_pages code paths against bogus nodes Message-ID: <20180802073147.GA10808@dhcp22.suse.cz> References: <20180801200418.1325826-1-jeremy.linton@arm.com> <20180801200418.1325826-3-jeremy.linton@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180801200418.1325826-3-jeremy.linton@arm.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed 01-08-18 15:04:18, Jeremy Linton wrote: > Its possible to crash __alloc_pages_nodemask by passing it > bogus node ids. This is caused by NODE_DATA() returning null > (hopefully) when the requested node is offline. We can > harded against the basic case of a mostly valid node, that > isn't online by checking for null and failing prepare_alloc_pages. > > But this then suggests we should also harden NODE_DATA() like this > > #define NODE_DATA(nid) ( (nid) < MAX_NUMNODES ? node_data[(nid)] : NULL) > > eventually this starts to add a bunch of generally uneeded checks > in some code paths that are called quite frequently. But the page allocator is really a hot path and people will not be happy to have yet another branch there. No code should really use invalid numa node ids in the first place. If I remember those bugs correctly then it was the arch code which was doing something wrong. I would prefer that code to be fixed instead. > Signed-off-by: Jeremy Linton > --- > include/linux/gfp.h | 2 ++ > mm/page_alloc.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/include/linux/gfp.h b/include/linux/gfp.h > index a6afcec53795..17d70271c42e 100644 > --- a/include/linux/gfp.h > +++ b/include/linux/gfp.h > @@ -436,6 +436,8 @@ static inline int gfp_zonelist(gfp_t flags) > */ > static inline struct zonelist *node_zonelist(int nid, gfp_t flags) > { > + if (unlikely(!NODE_DATA(nid))) //VM_WARN_ON? > + return NULL; > return NODE_DATA(nid)->node_zonelists + gfp_zonelist(flags); > } > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index a790ef4be74e..3a3d9ac2662a 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -4306,6 +4306,8 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order, > { > ac->high_zoneidx = gfp_zone(gfp_mask); > ac->zonelist = node_zonelist(preferred_nid, gfp_mask); > + if (!ac->zonelist) > + return false; > ac->nodemask = nodemask; > ac->migratetype = gfpflags_to_migratetype(gfp_mask); > > -- > 2.14.3 > -- Michal Hocko SUSE Labs