From patchwork Sun Oct 11 03:59:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 270405 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=-6.8 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 3943EC433E7 for ; Sun, 11 Oct 2020 03:59:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0BB120882 for ; Sun, 11 Oct 2020 03:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602388792; bh=RCzQwM8WtglLjJhSNFOU8wwaOJ5LC0iVDQpj1OHaNJg=; h=Date:From:To:Subject:List-ID:From; b=0W9OmmHsrPQDBF0fBeDAw/swFhFmqLZ0/dSRnrdYNElr4uS3rdd3nK216nwjzKXqA J0avD0qVivXqj5gVbKhiQY2Md8tvk3mwsNsg1ohSKfQg9D/Z2uOgsNuOMr+FFRvqWb qwe1JxUzcTdq5MCwSMfi6LP0RV+HjFHVp3yp9NEI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730730AbgJKD7v (ORCPT ); Sat, 10 Oct 2020 23:59:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:52930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729217AbgJKD7v (ORCPT ); Sat, 10 Oct 2020 23:59:51 -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 C99DE207D3; Sun, 11 Oct 2020 03:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602388790; bh=RCzQwM8WtglLjJhSNFOU8wwaOJ5LC0iVDQpj1OHaNJg=; h=Date:From:To:Subject:From; b=fSiMy6BpJWTEzPZ90SrG6EJDHbi7z7iyLMCxc2LWjfHtFgaRGK9eIG4CXDWRht2Pr Sx+r7t3O8ahcx3zDnk6uD+KWMw6pU3zI9eCQyv5/whfRl1UyXqxjP7dBcmrI8lJZ5Z geKOaQ43tGN4IYIRhIee/3T/mZUcRTXDOQo1rMyc= Date: Sat, 10 Oct 2020 20:59:49 -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: [folded-merged] mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5.patch removed from -mm tree Message-ID: <20201011035949.VI0FylRzZ%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 removed from the -mm tree. Its filename was mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5.patch This patch was dropped because it was folded into mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch ------------------------------------------------------ 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 @@ -7904,6 +7905,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)