From patchwork Thu Oct 19 07:36:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 155349 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp217509vqb; Thu, 19 Oct 2023 00:38:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEnu9yYJpS1e4435sF0NTPu3cnw65owBFY8QqGx3UyEW2cC6yjWWEAmASY2B6wYOEmIAll4 X-Received: by 2002:a17:902:cecb:b0:1b0:f8:9b2d with SMTP id d11-20020a170902cecb00b001b000f89b2dmr1514341plg.29.1697701099758; Thu, 19 Oct 2023 00:38:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697701099; cv=none; d=google.com; s=arc-20160816; b=gNfdoATEELf4gh4poY3+oXK7WIwxf8rwjRIAZxJlMF0ogCufaPXbZhD564QW4zBK/A UconTA0vVM9A290YnemxSSFhkoLuX1eQry6b+u9C/2rRYAQa7a44d5fh9Val/JRgRcZu RMdyUy7eeBrwpele+61OFOQ13Dhjt4+T2OH9heHebCmQYhejAIwQR0mSpYzHFEGu0mz/ qQ8c8FwpsbhM8K52L6HX4l4RWAzcLtZE9MvHtwIyMF1K+2EwTQC45QXWDS9qpXOKseAk 954Vj5T17jiOqUS7WLVYUYwCFD0x2rWf18mY48Iqpvm0J7Oq5KX2ujnZiFKyym9zCtNw nTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hrlA2D0tsTZAhmUT4zIyvppYy9kAGeNu6j+59eQyeHI=; fh=sfcVOgYtZePY21+UVXSJ05iBxN2n4QtX3V2hPqRe5TU=; b=jxy4EboQs84lAD4DT2PyP5Khn5DCsYj5MUk+Wn1KZGJUZUs2CloJsxc4h62IrESOwh Lzc6HFq3AwqC9SNRNZLtS6AuLrdlP35aO22Fzybuzu4+Iuja21OKB+5HapaE2u/2rOdo PyKcaM3e2/NCbcb2E4nhxvqaQizp/kj7zhXB+OEX/Aia3bjCOwurTH8UisJfqjoNKYmv efr4zOl3qXdba30gsoWwMsZ+0zxt4O6NqkLgJa+NC5K1cTUQewYM62xZARI5vdqAfSoD vN890+sZn87LVwC50QsaQqgZLxslpWmMWQSg+tv1aZ+UMSfXhF2viSN1mWCKPMenXYvc PBhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=Z4+ZKW4v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id y13-20020a17090322cd00b001c89c86160bsi1717004plg.385.2023.10.19.00.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 00:38:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=Z4+ZKW4v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 0788082159F8; Thu, 19 Oct 2023 00:38:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232829AbjJSHiQ (ORCPT + 24 others); Thu, 19 Oct 2023 03:38:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232707AbjJSHiO (ORCPT ); Thu, 19 Oct 2023 03:38:14 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 251149F for ; Thu, 19 Oct 2023 00:38:13 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1ca3c63d7f0so3702135ad.1 for ; Thu, 19 Oct 2023 00:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1697701092; x=1698305892; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hrlA2D0tsTZAhmUT4zIyvppYy9kAGeNu6j+59eQyeHI=; b=Z4+ZKW4vnMcMLXiJtV6pHmXtWRjyLa2zxGWvaZxjcHSzjdMsnHjaTz9uQuBDSSGaC5 ytoN/7dxUbCHHgAXtbFI8S7FtVG+rd6g5AhHYxbnIAS+8ixWr9kC8GvY1d/G+okEDya+ jbNiZjcD5LRV1P0fw9wx71JLddJrGdrCTRK/naH9kMSt1MQbUbM9J96G5V+43PAcfZh7 j8QVa9e1ubHMf3wpffnxLBZsebo5n6Gxpf0a7G6xoe3nOlhevpv3Ev/u+1BKiH+fwn96 RAYPYGedSBMDsNh5HnbmREoIKIeEBXkVDGcxIPj2TDa8Adoy9+22xJsIRDlSC64WpXTD aFkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697701092; x=1698305892; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hrlA2D0tsTZAhmUT4zIyvppYy9kAGeNu6j+59eQyeHI=; b=u7v0PqTzC2T0bkuePgOQ1eveiL5lSG5i0EigrZEruWCc1hGbrdkZf0/dhs8lTmL644 1hecIgOrGCRCaz3Ma8ZijpEycGIDo7sObQLMkL+cQZkDg+i7B/ZafOj2vqrgjuipxY5O xotD8zbuKxSkhOQlPyjcrfwPQRak92EcGX9+B4xs2A5rpQro6GiS7FnX4ZVJSbPYPTUs +fmB0rejO5GZ25o4hwFfN8og6yaHgS7UOJZbFAHXaEthFcJIAaiALmZdDbgyRuZC1h1g iikPUakjYBXmhY7X020eS2iZj/EOkYdN18sZDtDCoVs071h0qqo+PXRNnk9udnfaMeps Beog== X-Gm-Message-State: AOJu0YykX70xFDyNjSd0tJKzPH5BtiK9ArFFIuPvE+jPsIYQutOtMfrb 3hnvyRCgR8wMoILnllYdHgHm6kZXYKu6b0BvpNI= X-Received: by 2002:a17:902:e5c1:b0:1ca:858d:5bef with SMTP id u1-20020a170902e5c100b001ca858d5befmr1524433plf.4.1697701092603; Thu, 19 Oct 2023 00:38:12 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id d9-20020a170902854900b001c5d09e9437sm1194306plo.25.2023.10.19.00.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 00:38:12 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, rppt@kernel.org, david@redhat.com, vbabka@suse.cz, mhocko@suse.com Cc: willy@infradead.org, mgorman@techsingularity.net, mingo@kernel.org, aneesh.kumar@linux.ibm.com, ying.huang@intel.com, hannes@cmpxchg.org, osalvador@suse.de, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Qi Zheng Subject: [PATCH v2 1/2] mm: page_alloc: skip memoryless nodes entirely Date: Thu, 19 Oct 2023 15:36:26 +0800 Message-Id: <7928768f2658cd563978f5e5bf8109be1d559320.1697687357.git.zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 19 Oct 2023 00:38:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780168628265221892 X-GMAIL-MSGID: 1780168628265221892 In find_next_best_node(), We skipped the memoryless nodes when building the zonelists of other normal nodes (N_NORMAL), but did not skip the memoryless node itself when building the zonelist. This will cause it to be traversed at runtime. For example, say we have node0 and node1, node0 is memoryless node, then the fallback order of node0 and node1 as follows: [ 0.153005] Fallback order for Node 0: 0 1 [ 0.153564] Fallback order for Node 1: 1 After this patch, we skip memoryless node0 entirely, then the fallback order of node0 and node1 as follows: [ 0.155236] Fallback order for Node 0: 1 [ 0.155806] Fallback order for Node 1: 1 So it becomes completely invisible, which will reduce runtime overhead. And in this way, we will not try to allocate pages from memoryless node0, then the panic mentioned in [1] will also be fixed. Even though this problem has been solved by dropping the NODE_MIN_SIZE constrain in x86 [2], it would be better to fix it in core MM as well. [1]. https://lore.kernel.org/all/20230212110305.93670-1-zhengqi.arch@bytedance.com/ [2]. https://lore.kernel.org/all/20231017062215.171670-1-rppt@kernel.org/ Signed-off-by: Qi Zheng Acked-by: David Hildenbrand --- mm/page_alloc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ee392a324802..e978272699d3 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5052,8 +5052,11 @@ int find_next_best_node(int node, nodemask_t *used_node_mask) int min_val = INT_MAX; int best_node = NUMA_NO_NODE; - /* Use the local node if we haven't already */ - if (!node_isset(node, *used_node_mask)) { + /* + * Use the local node if we haven't already. But for memoryless local + * node, we should skip it and fallback to other nodes. + */ + if (!node_isset(node, *used_node_mask) && node_state(node, N_MEMORY)) { node_set(node, *used_node_mask); return node; } From patchwork Thu Oct 19 07:36:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 155350 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp217742vqb; Thu, 19 Oct 2023 00:38:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEiS7tA+kQjj+Z001bSkxkTxoUKkLooMh1XtirHxNs8QKAPWK11Ed01PQzSvpmamjDsfAsd X-Received: by 2002:a05:6a20:8428:b0:13f:c40c:379 with SMTP id c40-20020a056a20842800b0013fc40c0379mr1567554pzd.13.1697701135068; Thu, 19 Oct 2023 00:38:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697701135; cv=none; d=google.com; s=arc-20160816; b=SSAmNC6vYdmCgH3a3gAbWYOfT2wMSC3L0pFiGTj7PRw13Ky+i+GAgRT8LGoArB10Bp 4ZcOisXXxK9QfvHYvKpuP4TN5/UfUey1aFqOTvil/WsWe0OYJf9L7NLkaecVkN4d6eCt MIjsvWLw9kuvoGfO4SQADzaoPXinkDoIrHhrlqCszlm/ezjZjeE/sNJP7pctzwAbCx4W GM5sJyohoiGe4B9+IuTvVEiwSUX3loTaSWpWUCrHQuZnTnAr21yOlFQelH9zd7ae12QX Qs+nRLO7zl2Os/AoYj3+iPNbNhTqpd5VYYa30CamjtAFzI3JODp5s99fGGqCwe1OfmRx AbGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6cxQgxjhn9SWJh0Wr98V4tbQtLJu0AylqKOEAskAE6c=; fh=sfcVOgYtZePY21+UVXSJ05iBxN2n4QtX3V2hPqRe5TU=; b=e/V0yVWd+Ydb4CWR7xo0Ns5ere162foeBoyPd1WXy/sh2INaWNrrT+YWsKAmq4DAqe ftV0mgM2AWLDBUgszWkRa7O5dsv+qgdmIN/DnKG8rPZLrZJfU2QqFBJQgEzlYKIqcBzL HB46XNDK6/8zkRX+BJOyt5ai64KTTVtPXkUKlUAvbpGA96xdj9d6SccgDe8yNFM/dqbd 25oG36wCfgS0E+h2fyUGIo0T77bflvG9NdB9K3F0L1o8EcGjflkMELgVZH9UsqQF07L+ MC2zsclzg/teIa3I2R9Nvx3X6S6NiNOSSpr3t/QMCU/clSLsxfoUeymN06qoM9+NUEAD CjqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=OBaLRyDg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id 22-20020a17090a019600b00263a5cf8e64si1460123pjc.67.2023.10.19.00.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 00:38:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=OBaLRyDg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id DEB8E81142C9; Thu, 19 Oct 2023 00:38:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232809AbjJSHim (ORCPT + 24 others); Thu, 19 Oct 2023 03:38:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233115AbjJSHij (ORCPT ); Thu, 19 Oct 2023 03:38:39 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A564A126 for ; Thu, 19 Oct 2023 00:38:18 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1ca79b731f1so8971725ad.0 for ; Thu, 19 Oct 2023 00:38:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1697701098; x=1698305898; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6cxQgxjhn9SWJh0Wr98V4tbQtLJu0AylqKOEAskAE6c=; b=OBaLRyDgvCRHOiC6+ZemxGRI6j6EhGoUYZqiYe0y2G7GYFfC3lKxefHzD31d20NxDl m9atCDAhJKY2hSjyV+cYxZcLmjKEBfYJXupBqR6TQExTEbrkwOVQh+NI79BJ0M9/k9Z4 IGFgGTbJ56CHrH9Gi2B2nwU0TmZHMEuHlK9GZeoHJgv7r05XUrQag9KYA8hR8VRAQnvn 4enqSTymp78wYrcIlsuPA5NZ8SIeEycnLOaIbgYJiEawqL6bb85ajv1Yge1cRgECasXz mwPayUP9EmgTWg2T1apEM/MslUje7FaeyQuNKiDVCJiQrkxB4HNpXYGAR1PRAecz1P4x xMCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697701098; x=1698305898; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6cxQgxjhn9SWJh0Wr98V4tbQtLJu0AylqKOEAskAE6c=; b=u8EQHRa2wZeF3x9dMzqFj/aGM6h6gVsGL+bG6rRGGMymtHvItUCqShZY+S4v2oKNwe eiyBbFYNBsnM6xyhGdCnb6x3Wjd5H1FKwvZwqb2AtnsftdXi9yXEuorEO/wvU2GgxhHV 8sveum6GahxchqBb3ASkCK29O45OvPAk2UPBznNNARxuYBD51rXhM0dFYNtmVKcGboVv quavbPhog68/8pYwCsAf+4skLW2ui+BTnaSzYdysrBml5in7vOVQUbCoDgY4Cpfv5+s2 3LjUazBLfAi/YWpnBHkdtmcbq2uE2c3XU8O7wrrlbl9k4MdYX5vNsKQ2nOlPpAP9+Alb zreA== X-Gm-Message-State: AOJu0Yy/5FNhMb/5QamNZGye58cytNxeuPGarepCcuerpmETIf+57kUX s5B3MBiAOlDQl2/zjvuqZMuxUw== X-Received: by 2002:a17:903:705:b0:1ca:273d:232 with SMTP id kk5-20020a170903070500b001ca273d0232mr1566517plb.0.1697701098152; Thu, 19 Oct 2023 00:38:18 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id d9-20020a170902854900b001c5d09e9437sm1194306plo.25.2023.10.19.00.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 00:38:17 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, rppt@kernel.org, david@redhat.com, vbabka@suse.cz, mhocko@suse.com Cc: willy@infradead.org, mgorman@techsingularity.net, mingo@kernel.org, aneesh.kumar@linux.ibm.com, ying.huang@intel.com, hannes@cmpxchg.org, osalvador@suse.de, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Qi Zheng Subject: [PATCH v2 2/2] mm: memory_hotplug: drop memoryless node from fallback lists Date: Thu, 19 Oct 2023 15:36:27 +0800 Message-Id: <32c12381941f347ebafb9cb5bc9f0a4a535ff646.1697687357.git.zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 19 Oct 2023 00:38:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780168665614452026 X-GMAIL-MSGID: 1780168665614452026 In offline_pages(), if a node becomes memoryless, we will clear its N_MEMORY state by calling node_states_clear_node(). But we do this after rebuilding the zonelists by calling build_all_zonelists(), which will cause this memoryless node to still be in the fallback list of other nodes. This will incur some runtime overhead. To drop memoryless node from fallback lists in this case, just call node_states_clear_node() before calling build_all_zonelists(). Signed-off-by: Qi Zheng Acked-by: David Hildenbrand --- mm/memory_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index d4a364fdaf8f..18af399627f0 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -2036,12 +2036,12 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages, /* reinitialise watermarks and update pcp limits */ init_per_zone_wmark_min(); + node_states_clear_node(node, &arg); if (!populated_zone(zone)) { zone_pcp_reset(zone); build_all_zonelists(NULL); } - node_states_clear_node(node, &arg); if (arg.status_change_nid >= 0) { kcompactd_stop(node); kswapd_stop(node);