From patchwork Mon Jan 28 14:45:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 10783837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E10F914E1 for ; Mon, 28 Jan 2019 14:45:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFAE32AF10 for ; Mon, 28 Jan 2019 14:45:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1E742AF3E; Mon, 28 Jan 2019 14:45:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D5502AF10 for ; Mon, 28 Jan 2019 14:45:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C7DC8E000A; Mon, 28 Jan 2019 09:45:18 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 475CE8E0001; Mon, 28 Jan 2019 09:45:18 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A62B8E000A; Mon, 28 Jan 2019 09:45:18 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id B9F2D8E0001 for ; Mon, 28 Jan 2019 09:45:17 -0500 (EST) Received: by mail-ed1-f70.google.com with SMTP id l45so6713165edb.1 for ; Mon, 28 Jan 2019 06:45:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=20RN4Ot/Ll9C5dQDy9pNPCPR7Irx0eiJja18LrztjV4=; b=XNmblRrVD31+VxTyfgvRqf6subtKrDylndtFTb4Ivc3uvSAhDUCcp54KeOqI6C/edV V3qbFUyrOfH/P1UMP1s2eeeUbCQQz8JPvh1gGXBzVGe2OmpdmpAvjY5dNAYw+UVHA8gu qNIcIVZpds+E6B7AItEhfv9OUzj2BM2DvyTEkxE8efem4nzyKhkj3kMhjud2lIeUyPhd 65LBqLJWVTJvrFMSuBV71utjNVyoyfCqKMrKpjGgNoNraSCKK2AzdCaNUBgCA1lQmjcJ ao243t+rgdL5a3VGEag15c5PkMJs8cnLiqfa0D3f0UDCjCZAXXNayize7amK0xgTL/ZA 4kFA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Gm-Message-State: AJcUukfo9aD05F7Ru6ri3NbNoC4Aw56XX9ygDfIi9NFBvp02Kwv/Ufmy EA8iQAxH98hVCUYqEI90jQJVdH7mztlhJGfxbZ1ZH/hUoNZKM4krW8bVgrYG7VE3A2XTV0YSnbo fBTRF+0B/zDP6k87z9ekTKJayYc1RNN1AW/3tAImp40ouXp/5hiKvxbE3VndrnUkZRNOxJirOmv vU/cZY5QiXPPmNMJVKOOy8hdUvct85zF1JGlZVhjScBoviPIunSKU1iDPs/LaZwnIzqWinAj8we mFNGoW6tDYNyfuEbQ+A+GM4Dv7pdvABr5BBHQz2VbESUXYWyZf52Ov6ndWyKr90O+7E6annKAFA c0MztU/KM4JcyQy/KG7jhkkS5TPADlykaD+8KPQEO/gpaBhMCNvZkt6H73GPmedsVS3SJrR4ew= = X-Received: by 2002:a17:906:c2cd:: with SMTP id ch13mr18813368ejb.198.1548686717223; Mon, 28 Jan 2019 06:45:17 -0800 (PST) X-Received: by 2002:a17:906:c2cd:: with SMTP id ch13mr18813313ejb.198.1548686716222; Mon, 28 Jan 2019 06:45:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548686716; cv=none; d=google.com; s=arc-20160816; b=oTEeQ7hkgBpZ1+hQtjEKDXprgEz5qMu0CkXRcSXeIJzVpXlYYU/a/hlHUtrnutKrp5 sHA+wbysd7DPewchhPlLw2OAtchhB6fAdILCqyaaeU61HVETNfWi5av3GZMQYjehQyQZ ZVJgnjs7DiW5qB18mora9BRkigbkm9vwss6ZbJeW9QnWrNvE/Cu8rHa+dP1KfcBGhGwo Kq4P01WL+SwpjSb0LW0tTu12k8wXAVx1AN7a5xH/SiROOFiEUSRGKg79dN5C6ivOPr7X eBjM1mxkPvcWJwXWQ0zkVelPPAAOaqZvR1oU7Py1TxSicjubQQIXKEiMdEc3jjq4ejGC 38wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=20RN4Ot/Ll9C5dQDy9pNPCPR7Irx0eiJja18LrztjV4=; b=sie+U/n4izy3MJlmGwBqm/d+KeqMeLn+JzMZg6piCU28oh+puaQuXExxZNPudwqeFv SmbdvOACcfX8y34znGSjLNfADDVO0ZbIB5do6p2cZK3qXGxzyLfkS1b7x4+omspfcRi+ jMN41Rol7VBHm9aS1uEOlccS8YHLsVFynHppAvl//BeepXDsieyLOFleK6oJ6xbwxfT3 x89CdaqBrdhUlM11mdI8XeujJypSnUxn8qV9UChus9NSnvdJPQ4f8BgdDTz7R+zEL02u 0x44sHGVR1jELtGWVqRT+GUC/7ODcntMuV8i8K87v7ttvx5qgWaO9rerbn4+9oyeWfID igBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l52sor31136483edc.17.2019.01.28.06.45.16 for (Google Transport Security); Mon, 28 Jan 2019 06:45:16 -0800 (PST) Received-SPF: pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Google-Smtp-Source: ALg8bN5V/XrVCAGFvAeKOM6OXjDXHjVZ8bDG7fiP1ZYe7gGffkuJLxpuoCDWNjAhGPGfBirUc3C4Tg== X-Received: by 2002:a05:6402:758:: with SMTP id p24mr22446609edy.92.1548686715871; Mon, 28 Jan 2019 06:45:15 -0800 (PST) Received: from tiehlicka.microfocus.com (prg-ext-pat.suse.com. [213.151.95.130]) by smtp.gmail.com with ESMTPSA id j8sm2919064ejr.17.2019.01.28.06.45.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 06:45:15 -0800 (PST) From: Michal Hocko To: Mikhail Zaslonko , Mikhail Gavrilov Cc: Andrew Morton , Pavel Tatashin , schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, gerald.schaefer@de.ibm.com, , LKML , Michal Hocko Subject: [PATCH 1/2] mm, memory_hotplug: is_mem_section_removable do not pass the end of a zone Date: Mon, 28 Jan 2019 15:45:05 +0100 Message-Id: <20190128144506.15603-2-mhocko@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190128144506.15603-1-mhocko@kernel.org> References: <20190128144506.15603-1-mhocko@kernel.org> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Michal Hocko Mikhail has reported the following VM_BUG_ON triggered when reading sysfs removable state of a memory block: page:000003d082008000 is uninitialized and poisoned page dumped because: VM_BUG_ON_PAGE(PagePoisoned(p)) Call Trace: ([<0000000000385b26>] test_pages_in_a_zone+0xde/0x160) [<00000000008f15c4>] show_valid_zones+0x5c/0x190 [<00000000008cf9c4>] dev_attr_show+0x34/0x70 [<0000000000463ad0>] sysfs_kf_seq_show+0xc8/0x148 [<00000000003e4194>] seq_read+0x204/0x480 [<00000000003b53ea>] __vfs_read+0x32/0x178 [<00000000003b55b2>] vfs_read+0x82/0x138 [<00000000003b5be2>] ksys_read+0x5a/0xb0 [<0000000000b86ba0>] system_call+0xdc/0x2d8 Last Breaking-Event-Address: [<0000000000385b26>] test_pages_in_a_zone+0xde/0x160 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. Reported-by: Mikhail Zaslonko Debugged-by: Mikhail Zaslonko Signed-off-by: Michal Hocko Reviewed-by: Oscar Salvador --- 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 b9a667d36c55..07872789d778 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1233,7 +1233,8 @@ static bool is_pageblock_removable_nolock(struct page *page) bool 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)) { From patchwork Mon Jan 28 14:45:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 10783839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 71EA414E1 for ; Mon, 28 Jan 2019 14:45:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61B5A2AF10 for ; Mon, 28 Jan 2019 14:45:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 564992AF3E; Mon, 28 Jan 2019 14:45:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E22F12AF10 for ; Mon, 28 Jan 2019 14:45:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 89B1F8E000B; Mon, 28 Jan 2019 09:45:19 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7FC478E0001; Mon, 28 Jan 2019 09:45:19 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A1F08E000B; Mon, 28 Jan 2019 09:45:19 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id EC6938E0001 for ; Mon, 28 Jan 2019 09:45:18 -0500 (EST) Received: by mail-ed1-f69.google.com with SMTP id e29so6777052ede.19 for ; Mon, 28 Jan 2019 06:45:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nTySQcXDgbgWvZzIuOomkfESKJ+ZiRRspPXpQ++HP0Y=; b=Ri4Wp1OCTkvvrlGKubePID2QfCAKUBZSSBUXp4kWpBabeqOhU7qhIDzb6MkBuWA7PU B4tPs5IAjNjWzYEsM1LWPUL+3LZnPesqGkR0wGgdtIYdu3JBOFHOkzyDs1hXrBLp6ROF a4ixadwQmYt+ip+oNbDF7xiJalQoeVkShQcYX8vigKN17LRoUeu3LOBbvu7gyjE5XQtl T9GIDxb9Ht3sYuDWyOlwHnaV/0h/uhaEfd08mXc2rsC0ioQxmaG8uV56V9ScxhL9jleP 057ZR7a8rQLQ1mA7FAnhxPlLieVuCHbCkQ9FksS0d7WU8MDFU8hNFJSfp04L8WZdSFfX /9qg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Gm-Message-State: AJcUukd9px44PL6omPN4+ExNpzxzq35cjEW/njRX4E7jGdpX8275Wr+N IcXPleZRBgwTiRnb8sHYaCvUqvo5watQFrbgt5IBPWQJD4SY9Bhr3qBMgm9PLHz5We0ZeY/4nnm VwOI5dyszYc94l+6970hQ/kYhzqw7++4bmKuG+ZOiIm4uzLaTKGcxiTW2y0u7dvQL5hklpDvwB6 tzrrMgQzUNiLxnP975kkUvZJsoFzt0sEsVV/qHVYc3T/dtY1WLKALQzzxhUcK1L/SJYnDHOipAZ ay5XVAnSZRAxIn4huIS32aH0tKK2I5Z5QQR81RIxNfPFXWFARqEWxb8VLZvODAosOezKL5gmSD7 Zmo4ej8eADJBV2ETZjW9QE6sy43T9h1vl3dSia3TFxDihL/EMvi+u00D3g5QuVzxVN2GOcKICg= = X-Received: by 2002:a17:906:1d5:: with SMTP id 21-v6mr18981844ejj.206.1548686718458; Mon, 28 Jan 2019 06:45:18 -0800 (PST) X-Received: by 2002:a17:906:1d5:: with SMTP id 21-v6mr18981807ejj.206.1548686717569; Mon, 28 Jan 2019 06:45:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548686717; cv=none; d=google.com; s=arc-20160816; b=HKGSgz2f93V8x1K32juIc17UeDng6cGL+itE8oYCecdKuE7Ee1A+A/iIPD8W2X/7QG c0wHNLoUB+2o791cgDOEpeN9rBTlxNR4mtbA+k819Nq9GNPFTbr7tT9iViTBfq1M+zfe ycMmqfQ/iPDxTUwT4tKkgUagPnjTTXDJNMi/26b1vjNQrUOfTU3agw3q4wwDJBixoPRR 76xbXCb62aIpoaSHzXEXSLiI66Akx9wp+ltQ1dH6wxUuiYCh8Gro5i6fTovetHfrKqR8 mbexk18EUF+hz4zbS2/er1Rled7LdcURufuwaH3sy6VSUsugPIqUVwZimQLCzrw20rPi vbkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=nTySQcXDgbgWvZzIuOomkfESKJ+ZiRRspPXpQ++HP0Y=; b=kI/q57/aAdLnAN0rAXsYHQ2QKkUGT/JiSHK/STt9MVAJWmORFYgIL2lZfUQXTVf6Vr mIAFp1qClU16hpYZiXok1SA+duwLaNWTB5A2tomBzd7pEtOzb9YKAHYnXoAm5LN/CH7T grxKh1QJ5rdUSzpAIhV9Kk0A1No/Y41fhMRn44X8XFL3AagpBeUuFJrO2KCkF/odprtq MhW0tPkUBC10glYx18O3ZjcOXFYHkZNXc/xXUGUX3tbUohhuqIOwjZhmNsQHR7uQwK6Y SjJOkP53oxwmYhIbBSclcNIdZVDMgu2BRxMChbVqMxFIgza4tAaYru8N51bQi9DO77GW ThtQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a37sor29758587edd.23.2019.01.28.06.45.17 for (Google Transport Security); Mon, 28 Jan 2019 06:45:17 -0800 (PST) Received-SPF: pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Google-Smtp-Source: ALg8bN4SDZcBeV3rbkI2gxNZ8px9xHNMo/kDxk2X/qizXtVKHesg5Jmhm964+1jN/CWGYVmWZahd/Q== X-Received: by 2002:a50:b3b8:: with SMTP id s53mr22208336edd.122.1548686717177; Mon, 28 Jan 2019 06:45:17 -0800 (PST) Received: from tiehlicka.microfocus.com (prg-ext-pat.suse.com. [213.151.95.130]) by smtp.gmail.com with ESMTPSA id j8sm2919064ejr.17.2019.01.28.06.45.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 06:45:16 -0800 (PST) From: Michal Hocko To: Mikhail Zaslonko , Mikhail Gavrilov Cc: Andrew Morton , Pavel Tatashin , schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, gerald.schaefer@de.ibm.com, , LKML , Michal Hocko Subject: [PATCH 2/2] mm, memory_hotplug: test_pages_in_a_zone do not pass the end of zone Date: Mon, 28 Jan 2019 15:45:06 +0100 Message-Id: <20190128144506.15603-3-mhocko@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190128144506.15603-1-mhocko@kernel.org> References: <20190128144506.15603-1-mhocko@kernel.org> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Mikhail Zaslonko If memory end is not aligned with the sparse memory section boundary, the mapping of such a section is only partly initialized. This may lead to VM_BUG_ON due to uninitialized struct pages access from test_pages_in_a_zone() function triggered by memory_hotplug sysfs handlers. Here are the the panic examples: CONFIG_DEBUG_VM_PGFLAGS=y kernel parameter mem=2050M -------------------------- page:000003d082008000 is uninitialized and poisoned page dumped because: VM_BUG_ON_PAGE(PagePoisoned(p)) Call Trace: ([<0000000000385b26>] test_pages_in_a_zone+0xde/0x160) [<00000000008f15c4>] show_valid_zones+0x5c/0x190 [<00000000008cf9c4>] dev_attr_show+0x34/0x70 [<0000000000463ad0>] sysfs_kf_seq_show+0xc8/0x148 [<00000000003e4194>] seq_read+0x204/0x480 [<00000000003b53ea>] __vfs_read+0x32/0x178 [<00000000003b55b2>] vfs_read+0x82/0x138 [<00000000003b5be2>] ksys_read+0x5a/0xb0 [<0000000000b86ba0>] system_call+0xdc/0x2d8 Last Breaking-Event-Address: [<0000000000385b26>] test_pages_in_a_zone+0xde/0x160 Kernel panic - not syncing: Fatal exception: panic_on_oops Fix this by checking whether the pfn to check is within the zone. [mhocko@suse.com: separated this change from http://lkml.kernel.org/r/20181105150401.97287-2-zaslonko@linux.ibm.com] Signed-off-by: Mikhail Zaslonko Signed-off-by: Michal Hocko Reviewed-by: Oscar Salvador --- mm/memory_hotplug.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 07872789d778..7711d0e327b6 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1274,6 +1274,9 @@ int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn, i++; if (i == MAX_ORDER_NR_PAGES || pfn + i >= end_pfn) continue; + /* Check if we got outside of the zone */ + if (zone && !zone_spans_pfn(zone, pfn + i)) + return 0; page = pfn_to_page(pfn + i); if (zone && page_zone(page) != zone) return 0;