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=-10.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT 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 61C8EC433E0 for ; Tue, 23 Jun 2020 09:43:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2E277206C3 for ; Tue, 23 Jun 2020 09:43:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E277206C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B02E86B0002; Tue, 23 Jun 2020 05:43:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB3766B0005; Tue, 23 Jun 2020 05:43:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C7836B0006; Tue, 23 Jun 2020 05:43:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0195.hostedemail.com [216.40.44.195]) by kanga.kvack.org (Postfix) with ESMTP id 853E16B0002 for ; Tue, 23 Jun 2020 05:43:04 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 2BDE48248047 for ; Tue, 23 Jun 2020 09:43:04 +0000 (UTC) X-FDA: 76959987888.17.actor48_1e12ef326e3a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 00A71180D0180 for ; Tue, 23 Jun 2020 09:43:03 +0000 (UTC) X-HE-Tag: actor48_1e12ef326e3a X-Filterd-Recvd-Size: 2078 Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Tue, 23 Jun 2020 09:43:02 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R211e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04357;MF=richard.weiyang@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0U0Uz0A9_1592905379; Received: from localhost(mailfrom:richard.weiyang@linux.alibaba.com fp:SMTPD_---0U0Uz0A9_1592905379) by smtp.aliyun-inc.com(127.0.0.1); Tue, 23 Jun 2020 17:42:59 +0800 From: Wei Yang To: akpm@linux-foundation.org, osalvador@suse.de, dan.j.williams@intel.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, david@redhat.com, Wei Yang Subject: [PATCH] mm/spase: never partially remove memmap for early section Date: Tue, 23 Jun 2020 17:42:58 +0800 Message-Id: <20200623094258.6705-1-richard.weiyang@linux.alibaba.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 X-Rspamd-Queue-Id: 00A71180D0180 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable 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: For early sections, we assumes its memmap will never be partially removed. But current behavior breaks this. Let's correct it. Fixes: ba72b4c8cf60 ("mm/sparsemem: support sub-section hotplug") Signed-off-by: Wei Yang --- mm/sparse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/sparse.c b/mm/sparse.c index b2b9a3e34696..1a0069f492f5 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -825,10 +825,10 @@ static void section_deactivate(unsigned long pfn, u= nsigned long nr_pages, ms->section_mem_map &=3D ~SECTION_HAS_MEM_MAP; } =20 - if (section_is_early && memmap) - free_map_bootmem(memmap); - else + if (!section_is_early) depopulate_section_memmap(pfn, nr_pages, altmap); + else if (memmap) + free_map_bootmem(memmap); =20 if (empty) ms->section_mem_map =3D (unsigned long)NULL; --=20 2.20.1 (Apple Git-117)