Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp577733img; Fri, 22 Mar 2019 04:25:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqx6iLkruPlukOP24a2G0nxv/B6H+whQu5Inzd1LH5e1dRpRUhCwo0vyTqbdGHlNnvgX4NmN X-Received: by 2002:a62:1611:: with SMTP id 17mr8632316pfw.139.1553253900348; Fri, 22 Mar 2019 04:25:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553253900; cv=none; d=google.com; s=arc-20160816; b=Z5fM1IGjSlOXn232db7SSgCQWXeXHAJcRMiyo/lw+d4GamBsQHqbz1CKUFI+K1jQ1H rnRSt4uTSHZj7lqWVtG4cu0BxbNx9RfWsnCeyfe5yldVGJptmDciGtBwOQ428+HEB5GS uE18h5UJPNDjtZ8gCTAIrr5HPu9Ya2FIBt9V7VoEaIH8jVEz0b6wwZ38ePdE40aWJRSy 8WyzBqNktVFGyk79Msjb/Yu5ceE+UOhGvTvJSl78sdtIA6/UP2WAe2GaSqfCpN7n5FY6 rI6vhPr3rlYA0RYs0+ADBSG9NPHcU3G0bWA+pK5Riamq8QggHqf2Mfk7qec6PFcrjcTa vhxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qak0ajns4pl3t4nXF9jakId7uX9dau+dfxnStQVHnQ4=; b=wHbr9f3PiGuuzYqrQTCMP/iZN0m0NSvU0uEHPyxvfEiF94BMenXZwl8+/R11D+hIDo ka2o3SIJZZekuRydHpew4lY8yBrHYnQwTptKQROj+ycsYXNVzXoWvmD8jKceWGrUu0K5 Sk0Em8pu/hASgrJIqTHFEnU2QrOw1ehe9/js4lPvI4qDuudMho+BRvsfx6vaMY40FtD+ ncFVblCINWy9hn0Ibu+BUq2orRfhfLl7OjV7g+JMJTnOmKpSJjpwVie9sNzour2hkDVy KyLRIrTs49fT/78oNhbDWx2lrjWfI+Lc84EICOzPTXDKtM87do6VpmJ0MCy8a8nXTDHK hpVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LQ2PalKg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w16si6707707pll.113.2019.03.22.04.24.45; Fri, 22 Mar 2019 04:25:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LQ2PalKg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728914AbfCVLXC (ORCPT + 99 others); Fri, 22 Mar 2019 07:23:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:49832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728514AbfCVLW7 (ORCPT ); Fri, 22 Mar 2019 07:22:59 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 72E6E2190A; Fri, 22 Mar 2019 11:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253777; bh=w3txfqindrxVAb8Bg3tAyG1Y76B9+pCbAEVIzWMQuxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LQ2PalKgFW9FTpVVUcoj5y5Syp+edjWPFhcbJJbWhmn6tYhcNQ37Pmac0zcFnz5BJ oynwTbMCuPuybJvgCx4sypN8v0lqXY+QbfNgBAuNorphF50zUMAbzm2R6jWCxmjwUJ 3bFT2xiYyTbhRZQE926IRgTBa9UvN8AVjd/K3z6s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michal Hocko , Mikhail Zaslonko , Gerald Schaefer , Mikhail Gavrilov , Oscar Salvador , Pavel Tatashin , Heiko Carstens , Martin Schwidefsky , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 3.18 069/134] mm, memory_hotplug: is_mem_section_removable do not pass the end of a zone Date: Fri, 22 Mar 2019 12:14:42 +0100 Message-Id: <20190322111215.069512805@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit efad4e475c312456edb3c789d0996d12ed744c13 ] Patch series "mm, memory_hotplug: fix uninitialized pages fallouts", v2. Mikhail Zaslonko has posted fixes for the two bugs quite some time ago [1]. I have pushed back on those fixes because I believed that it is much better to plug the problem at the initialization time rather than play whack-a-mole all over the hotplug code and find all the places which expect the full memory section to be initialized. We have ended up with commit 2830bf6f05fb ("mm, memory_hotplug: initialize struct pages for the full memory section") merged and cause a regression [2][3]. The reason is that there might be memory layouts when two NUMA nodes share the same memory section so the merged fix is simply incorrect. In order to plug this hole we really have to be zone range aware in those handlers. I have split up the original patch into two. One is unchanged (patch 2) and I took a different approach for `removable' crash. [1] http://lkml.kernel.org/r/20181105150401.97287-2-zaslonko@linux.ibm.com [2] https://bugzilla.redhat.com/show_bug.cgi?id=1666948 [3] http://lkml.kernel.org/r/20190125163938.GA20411@dhcp22.suse.cz This patch (of 2): Mikhail has reported the following VM_BUG_ON triggered when reading sysfs removable state of a memory block: page:000003d08300c000 is uninitialized and poisoned page dumped because: VM_BUG_ON_PAGE(PagePoisoned(p)) Call Trace: is_mem_section_removable+0xb4/0x190 show_mem_removable+0x9a/0xd8 dev_attr_show+0x34/0x70 sysfs_kf_seq_show+0xc8/0x148 seq_read+0x204/0x480 __vfs_read+0x32/0x178 vfs_read+0x82/0x138 ksys_read+0x5a/0xb0 system_call+0xdc/0x2d8 Last Breaking-Event-Address: is_mem_section_removable+0xb4/0x190 Kernel panic - not syncing: Fatal exception: panic_on_oops The reason is that the memory block spans the zone boundary and we are stumbling over an unitialized struct page. Fix this by enforcing zone range in is_mem_section_removable so that we never run away from a zone. Link: http://lkml.kernel.org/r/20190128144506.15603-2-mhocko@kernel.org Signed-off-by: Michal Hocko Reported-by: Mikhail Zaslonko Debugged-by: Mikhail Zaslonko Tested-by: Gerald Schaefer Tested-by: Mikhail Gavrilov Reviewed-by: Oscar Salvador Cc: Pavel Tatashin Cc: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/memory_hotplug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 05014e89efae..3fb2067c36a4 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1321,7 +1321,8 @@ static struct page *next_active_pageblock(struct page *page) int is_mem_section_removable(unsigned long start_pfn, unsigned long nr_pages) { struct page *page = pfn_to_page(start_pfn); - struct page *end_page = page + nr_pages; + unsigned long end_pfn = min(start_pfn + nr_pages, zone_end_pfn(page_zone(page))); + struct page *end_page = pfn_to_page(end_pfn); /* Check the starting page of each pageblock within the range */ for (; page < end_page; page = next_active_pageblock(page)) { -- 2.19.1