From patchwork Thu Jun 1 16:26:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifeng Xu X-Patchwork-Id: 102078 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp465134vqr; Thu, 1 Jun 2023 09:40:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7sTeH+kNPaRb/7a8A8njcYfXlwLEIU6Nl1BT6yoMjrYNjb7YNpyIrVsC+hm4rLXOLh3Thd X-Received: by 2002:a05:6a21:680b:b0:111:92ef:3146 with SMTP id wr11-20020a056a21680b00b0011192ef3146mr7024559pzb.25.1685637645549; Thu, 01 Jun 2023 09:40:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685637645; cv=none; d=google.com; s=arc-20160816; b=ui9xuTUYqO75AJFH8vyID7wa2NdQpENu0kJGjvYGGC8Tbi2qA9xSoIm/ejrsnJUspQ 9/iGkZ4gcf+PWL+JqVmNvAIso1T2khTImP0IYj8fcAqqv6xWCrFP9mJeKKv9p6zZJyb/ fbuJGwjmXPI92DZCbL3nJcHBp+mBBLqUtUW7DxAtcSaiJIsg1Y0SIcsw6vwutIEN2kpj eh1RDgf+fdw4aqWF6KwIkloyluxyCBC5fEM5tHrMSE1RqDN9NGOJt8/N9bGh85m0p7e3 MFrlKJJMM9QELqQzozVkFrMyk8e9KbHOrSxwX2TD4lUHftrNhIr+REpjzI/zttEWyJUb Jj+Q== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=nziXaIgwJ/5heFWqluluHQ82ERFUdGM6TmjJraDSTks=; b=qg4yIsOqaJUTZd2Az7dGRhDAhxOv+dS0pt6xLAPIE2OyAgc/6ZcB37A6kYu0vb4FJV YdJlRCix/PeL3584L5isDrfm54PDxzH+lhDEzdQ98IBWBMWhHcgtoZfxqjkO3Ptt9cHY TxqEQgLXvfaC+UWtQDWLx4CTA3rMvh4xJ+997xgtAsFehJ1SQXRhPqUpQt03+2YwzDMV GT1tRTkfMYBCS3GcBLJzjv0nOumxKjtweSD1q6yl/h0kcsqHaxIL/MnSLEpOoayNKeU8 XfPfW0nCuZAzduowaagzXpUlHADXQRUHcduQCsENFpQCmq532WalIAGmkPqJVQ59pFu9 8jkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=ES7I+iTe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i191-20020a6387c8000000b005428df9d73dsi151169pge.829.2023.06.01.09.40.27; Thu, 01 Jun 2023 09:40:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=ES7I+iTe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231546AbjFAQ1B (ORCPT + 99 others); Thu, 1 Jun 2023 12:27:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231544AbjFAQ1A (ORCPT ); Thu, 1 Jun 2023 12:27:00 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84FF418D for ; Thu, 1 Jun 2023 09:26:57 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1b1806264e9so5464145ad.0 for ; Thu, 01 Jun 2023 09:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1685636817; x=1688228817; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nziXaIgwJ/5heFWqluluHQ82ERFUdGM6TmjJraDSTks=; b=ES7I+iTe/v1lSnNrJYYaIzF7qH+PXEowpeFSRu7jvFOzX6UYcw7nNlu5gpBUHEgb3Z KPJaRvZYNmqKFsjy5Qmr2pwZvg1wRcSpIyThhnRgN2ny6Gw0UsYWa0r6Owuaw020lOMt Ko/4uP5G/cCnoZIuoocAIxmii+QLeZRrH8bn69pMv1D2VeRTYBvQm/e70cGC1lNBrY+J UUXffw3Hq0FJOrA2oGTrQ6Nl/1Q+oCbI9+sFTiU88RT9F7o/Uz/9+ma6aOKYx0p8/p7P iBtPzDg/CAuxvEvNTF+aOzDsojTE9nRze5lDlFveFMsLtOcJ0mVrkAQ+u9sPgmETIGPq cCZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685636817; x=1688228817; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nziXaIgwJ/5heFWqluluHQ82ERFUdGM6TmjJraDSTks=; b=BKK1BPgOkkLtdwcuCMtp1F4buzSSFn5EatIYRDePF7sfI9rufRu7mof8d8InQIXzpi 1IX6J4gi8MTUSpg4291ThPuO+OIr79ROJ0bA5dllIZ0HtpyQW85G+2fWfvoG7KwoJ7JP +0cKfbPa1kdGZePji6WCdImuOM66bMYtxINKXnJySMhEE4AFJ2nylA6z24bEWgE36T07 +c2vIZ2syoCNx6/qBAmum6IpWGs83jzOjF2Tg86QZM1srNFTe6UrY6S2gFBmRA6NRftX b1709NcJaKRqN8C3vZo1bvh+j1wIS/phvht21f3wwZmFRMtxaUf91YJn+8PfUJG/tNxU +yNg== X-Gm-Message-State: AC+VfDx1TsLct0JNclgZgyTQH5dnRN/ocoyurzOH7UNIbfPuag79LEim FKvNbokAyDdgsxt6RZj9bHe4mQ== X-Received: by 2002:a17:902:b18f:b0:1ab:7c4:eb24 with SMTP id s15-20020a170902b18f00b001ab07c4eb24mr5837438plr.22.1685636816818; Thu, 01 Jun 2023 09:26:56 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id b7-20020a170902650700b001acaf7e26bbsm3750487plk.53.2023.06.01.09.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 09:26:56 -0700 (PDT) From: Haifeng Xu To: david@redhat.com Cc: osalvador@suse.de, rppt@kernel.org, mhocko@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH 1/2] mm/memory_hotplug: remove reset_node_managed_pages() in hotadd_init_pgdat() Date: Thu, 1 Jun 2023 16:26:25 +0000 Message-Id: <20230601162626.1030-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 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_PASS,T_SCC_BODY_TEXT_LINE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767519180060909147?= X-GMAIL-MSGID: =?utf-8?q?1767519180060909147?= managed pages has already been set to 0 in free_area_init_core_hotplug(), so it's pointless to reset again. Signed-off-by: Haifeng Xu --- mm/memory_hotplug.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 8e0fa209d533..65e385f34679 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1210,7 +1210,6 @@ static pg_data_t __ref *hotadd_init_pgdat(int nid) * online_pages() and offline_pages(). * TODO: should be in free_area_init_core_hotplug? */ - reset_node_managed_pages(pgdat); reset_node_present_pages(pgdat); return pgdat; From patchwork Thu Jun 1 16:26:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifeng Xu X-Patchwork-Id: 102079 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp465230vqr; Thu, 1 Jun 2023 09:40:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6bSl5D3u7Q7jWBneA2Dogqn35h24OmTPy0FXR34xFW82+3LEs60ZSp//l+WqM3dfeoZD+6 X-Received: by 2002:a17:90a:684b:b0:255:83b6:2d0b with SMTP id e11-20020a17090a684b00b0025583b62d0bmr6960141pjm.17.1685637652264; Thu, 01 Jun 2023 09:40:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685637652; cv=none; d=google.com; s=arc-20160816; b=paUVORrW2Y9VdifukEyYJlKQN7cgYfcpvlrqEmLkrLCHrAZW3tFc9rTSwvo1KhhaIs YlMhNzaj77XcaDF8IUNEn36yJ8zLargC8Ga80eyUFAa/eNO//BiozbILVFLB2jJq7aWS wxZU/vzqnLHpGmb8AWiJo2vlOZSoTR0pFUh9KL7Epe70+qUHc/3ZAzM8r2XE5GnyGy6e cxgKVztJTfIi0MGf1gwjCi9TuzFm9AT62NLzVzsED8wCbReU5HukkIB18+BA6PUuRqeg 0f1EAgBKE9vSPqCj1CGbbs2GMjjfnThqZNXcXhHEeYtY8I089UYO8KlspSRSxlN8y8BX WYzg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=4ACJ9Qwha81LGr+RoxzBokRD6gcXSKrY0efwdDtNyXI=; b=jYP8OWH6ZCcQG9kQjvtsH1TTKMjgC/EmL7TtVf0c4VANIWLstR303yKap3qOuWM1+a OqC8JICUBX0SJZUIHdP8Wagc/VLVGsoAwKQxmrm+q7N1EP8ou78ws8jerwlyGNxbba+c VkCgL+UOnn4dXzMt2Q8t70XXgm/EM/V+t5tFDmx6sQYMPU3Rehoj+I7m0SqSUTfvQGQI 5Yazth5srYdkQXJF9Y9jc+UITWULvD69Xc3YXbwzJjpz6fAfgFQfo5m0A7UxApnON+y6 I8lLOpqTe1VVyEVUQaR1yblLBy5PWwN8E7UeAO82a7N1gsP0r2wc1gBnnynjI4KKSoKP eHPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=dg0s4ZFV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w24-20020a63af18000000b0053b8874cee1si1030549pge.418.2023.06.01.09.40.39; Thu, 01 Jun 2023 09:40:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=dg0s4ZFV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231573AbjFAQ1E (ORCPT + 99 others); Thu, 1 Jun 2023 12:27:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231544AbjFAQ1C (ORCPT ); Thu, 1 Jun 2023 12:27:02 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C710186 for ; Thu, 1 Jun 2023 09:27:01 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-517bdc9e81dso451873a12.1 for ; Thu, 01 Jun 2023 09:27:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1685636820; x=1688228820; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4ACJ9Qwha81LGr+RoxzBokRD6gcXSKrY0efwdDtNyXI=; b=dg0s4ZFVNYn6tepQuLsU2NKYtfl+oKWqpjFftzP47VwcfA0Ize5oVpiPgWqlAWp+5j xQBDKj3yUXWWxyz5/RCb+lkiDGZP4sRos+T9SN8FlMZ7XUZGVaVQIJTEypfh5ezqMjS0 uO1rmmHWRmVZUclfyHBGsUnZso2/aBY4CMXnsSi8ZIsh+yjhj79StoTGtdfVC07Z5ZcI LxvTdjr+etxaN2x/tqmZHe1+fUJYt/sTgD8S3HF9QyFqNCB+UTT4IFVkXUZl4bjwvIbY a60PPtBL5WOun5rAgCPL8svmav5dhdOsWr0p4QH+tfPKP7YTYl3LJIGqPk209bvx+HGA oH/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685636820; x=1688228820; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4ACJ9Qwha81LGr+RoxzBokRD6gcXSKrY0efwdDtNyXI=; b=ix3wloF/sPp8FLk8jMSwwoNsr6ztYu/6pzZgldYInWFyHl/iYo538gUSAIvIon1czk UppR6FmltOBKf0Pc6qdV4JXBizZUwNFctVoM2jO9obOvCvdcYlfSX8R3IoMTOtxOorIz S33pQ1dsXwEEpzwVTdeWts/YYY7SsPvnL2Skjd3Z4xd0oJ5QYLvcU/QyPgnOYjGc3Var cC8Ge1/GG1+KvTbuWGJsoYOHt+tTF588MFmK1QcIy2bAz/SGrUgVg25QFKkOhWDDqcLq TOx36zrRQ2Tr2TpD71j5kusUd0NiUEnn68pvysBSUvsqSujqrp6aOCSCwluZFeGAApx4 SLAw== X-Gm-Message-State: AC+VfDy7B5IhacpCgnfyMGHgJMMQu7U2NcafRrgkT3Q7biQsP3pc5UwY /loK2K0UPdXtqk55gQWhxHjNrw== X-Received: by 2002:a17:902:f682:b0:1af:a058:cc2d with SMTP id l2-20020a170902f68200b001afa058cc2dmr7831816plg.57.1685636820614; Thu, 01 Jun 2023 09:27:00 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id b7-20020a170902650700b001acaf7e26bbsm3750487plk.53.2023.06.01.09.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 09:27:00 -0700 (PDT) From: Haifeng Xu To: david@redhat.com Cc: osalvador@suse.de, rppt@kernel.org, mhocko@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH 2/2] mm/mm_init.c: remove reset_node_present_pages() Date: Thu, 1 Jun 2023 16:26:26 +0000 Message-Id: <20230601162626.1030-2-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 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_PASS,T_SCC_BODY_TEXT_LINE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767519186664897394?= X-GMAIL-MSGID: =?utf-8?q?1767519186664897394?= reset_node_present_pages() only get called in hotadd_init_pgdat(), move the action that clear present pages to free_area_init_core_hotplug(), so the helper can be removed. Signed-off-by: Haifeng Xu Acked-by: David Hildenbrand --- mm/memory_hotplug.c | 18 ------------------ mm/mm_init.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 65e385f34679..ee1c0d9a4d5a 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1172,16 +1172,6 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, return ret; } -static void reset_node_present_pages(pg_data_t *pgdat) -{ - struct zone *z; - - for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++) - z->present_pages = 0; - - pgdat->node_present_pages = 0; -} - /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ static pg_data_t __ref *hotadd_init_pgdat(int nid) { @@ -1204,14 +1194,6 @@ static pg_data_t __ref *hotadd_init_pgdat(int nid) */ build_all_zonelists(pgdat); - /* - * When memory is hot-added, all the memory is in offline state. So - * clear all zones' present_pages because they will be updated in - * online_pages() and offline_pages(). - * TODO: should be in free_area_init_core_hotplug? - */ - reset_node_present_pages(pgdat); - return pgdat; } diff --git a/mm/mm_init.c b/mm/mm_init.c index 78e67041ae9f..e24ea1db9e26 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1491,6 +1491,7 @@ void __ref free_area_init_core_hotplug(struct pglist_data *pgdat) { int nid = pgdat->node_id; enum zone_type z; + struct zone *zone; int cpu; pgdat_init_internals(pgdat); @@ -1507,6 +1508,8 @@ void __ref free_area_init_core_hotplug(struct pglist_data *pgdat) pgdat->kswapd_order = 0; pgdat->kswapd_highest_zoneidx = 0; pgdat->node_start_pfn = 0; + pgdat->node_present_pages = 0; + for_each_online_cpu(cpu) { struct per_cpu_nodestat *p; @@ -1514,8 +1517,15 @@ void __ref free_area_init_core_hotplug(struct pglist_data *pgdat) memset(p, 0, sizeof(*p)); } - for (z = 0; z < MAX_NR_ZONES; z++) - zone_init_internals(&pgdat->node_zones[z], z, nid, 0); + /* When memory is hot-added, all the memory is in offline state. So + * clear all zones' present_pages and managed_pages because they will + * be updated in online_pages() and offline_pages(). + */ + for (z = 0; z < MAX_NR_ZONES; z++) { + zone = &pgdat->node_zones[z]; + zone->present_pages = 0; + zone_init_internals(zone, z, nid, 0); + } } #endif