From patchwork Tue Sep 29 20:06:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 262861 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=-7.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 754F0C47420 for ; Tue, 29 Sep 2020 20:06:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13BDE21734 for ; Tue, 29 Sep 2020 20:06:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601409984; bh=MgkDxdhBMowd5jXoEvot8GmRj5AvJnoeDIsDFyxvu8I=; h=Date:From:To:Subject:List-ID:From; b=In/HgY/KsvNBKnSLxMWI9v7TDgkanUiP0xaHp3NowiOmvd5vmkda0IYa76vB8vhJe YRaPRA3e0rGbeYDEe7DFJKslWHnlmp5b401e0GV2KXa9nB15sADBsTkP1vnsZkKcqF UFJL/dB+ZRJtDDwa34zLDj16ibi68O8MzMzzeGZA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728959AbgI2UGX (ORCPT ); Tue, 29 Sep 2020 16:06:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:53880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728952AbgI2UGX (ORCPT ); Tue, 29 Sep 2020 16:06:23 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (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 0DC662076A; Tue, 29 Sep 2020 20:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601409982; bh=MgkDxdhBMowd5jXoEvot8GmRj5AvJnoeDIsDFyxvu8I=; h=Date:From:To:Subject:From; b=iz76TOilL5L8zsnPYRvdkiLISAfHayLcidpZjfLlVb6aORTXwwQHBCCuSMvUuKi0m /hUuiDp6HNyClfVMvz1Z2p9ggvuRpieLQDPH116vjkGAteBTj67nwHLy7gfrvegwSx urNEB6kxeaf5hQcwNIuYkBELstop1SKYeVFWaMO0= Date: Tue, 29 Sep 2020 13:06:21 -0700 From: akpm@linux-foundation.org To: aarcange@redhat.com, apais@microsoft.com, kirill.shutemov@linux.intel.com, mhocko@suse.com, mm-commits@vger.kernel.org, oleg@redhat.com, pasha.tatashin@soleen.com, songliubraving@fb.com, stable@vger.kernel.org, vijayb@linux.microsoft.com Subject: + mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5.patch added to -mm tree Message-ID: <20200929200621.F1WOHZJsG%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch titled Subject: mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5 has been added to the -mm tree. Its filename is mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Vijay Balakrishna Subject: mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5 made changes to move khugepaged_min_free_kbytes_update into init_per_zone_wmark_min and rested changes Link: https://lkml.kernel.org/r/1601398153-5517-1-git-send-email-vijayb@linux.microsoft.com Fixes: f000565adb77 ("thp: set recommended min free kbytes") Signed-off-by: Vijay Balakrishna Reviewed-by: Pavel Tatashin Acked-by: Michal Hocko Cc: Allen Pais Cc: Andrea Arcangeli Cc: "Kirill A. Shutemov" Cc: Oleg Nesterov Cc: Song Liu Cc: Signed-off-by: Andrew Morton --- mm/memory_hotplug.c | 3 --- mm/page_alloc.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) --- a/mm/memory_hotplug.c~mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5 +++ a/mm/memory_hotplug.c @@ -36,7 +36,6 @@ #include #include #include -#include #include @@ -858,7 +857,6 @@ int __ref online_pages(unsigned long pfn zone_pcp_update(zone); init_per_zone_wmark_min(); - khugepaged_min_free_kbytes_update(); kswapd_run(nid); kcompactd_run(nid); @@ -1617,7 +1615,6 @@ static int __ref __offline_pages(unsigne pgdat_resize_unlock(zone->zone_pgdat, &flags); init_per_zone_wmark_min(); - khugepaged_min_free_kbytes_update(); if (!populated_zone(zone)) { zone_pcp_reset(zone); --- a/mm/page_alloc.c~mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5 +++ a/mm/page_alloc.c @@ -69,6 +69,7 @@ #include #include #include +#include #include #include @@ -7891,6 +7892,8 @@ int __meminit init_per_zone_wmark_min(vo setup_min_slab_ratio(); #endif + khugepaged_min_free_kbytes_update(); + return 0; } postcore_initcall(init_per_zone_wmark_min)