From patchwork Fri Sep 25 02:52:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 263523 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=-8.0 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 44F6EC4727E for ; Fri, 25 Sep 2020 02:52:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A44921D20 for ; Fri, 25 Sep 2020 02:52:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601002355; bh=s/HdbBS1UehdyeCCPAL4AWwE5WTWtA8TK6q/2tWhzGQ=; h=Date:From:To:Subject:List-ID:From; b=jZ1Mfg13kpyRkT8mYuEHXBocebfPSZSO1FEQnjaoQSM3/tg2S0LqiFkgLdZOBi5+r hwh5bpXX6T5VXVDCL5DHXp8QeoumC9Zb0mkQH4l5Pwpo6oPpqXqIoNMawKkqD8rrRZ DH0IeVLvuOqKWO0pbGa3I7NeKOuXj8l3iTLuv1rM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726738AbgIYCwe (ORCPT ); Thu, 24 Sep 2020 22:52:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:50466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726704AbgIYCwe (ORCPT ); Thu, 24 Sep 2020 22:52:34 -0400 Received: from X1 (unknown [104.245.68.101]) (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 54FFF20888; Fri, 25 Sep 2020 02:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601002353; bh=s/HdbBS1UehdyeCCPAL4AWwE5WTWtA8TK6q/2tWhzGQ=; h=Date:From:To:Subject:From; b=TiMYoJieFr0pCKTRvwNW/ZwYITLiuLIc96XgO47a8/ZAsoX3VgQLaNT5uW6W0rOHX v99ZIOv/mMit1KAgzOQZRSllLQgZSrN+yb+Ix9f8Q5aI6zVCDrsc4deXD5RTUSbK4o SfIjCEhpMBx6pmxahOUPKlCcBL0yZNuk50jqqbZY= Date: Thu, 24 Sep 2020 19:52:32 -0700 From: akpm@linux-foundation.org To: mm-commits@vger.kernel.org, stable@vger.kernel.org, songliubraving@fb.com, pasha.tatashin@soleen.com, oleg@redhat.com, mhocko@suse.com, kirill.shutemov@linux.intel.com, apais@microsoft.com, aarcange@redhat.com, vijayb@linux.microsoft.com Subject: [to-be-updated] mm-khugepaged-avoid-overriding-min_free_kbytes-set-by-user.patch removed from -mm tree Message-ID: <20200925025232._Ro5x%akpm@linux-foundation.org> User-Agent: s-nail v14.9.10 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch titled Subject: mm: khugepaged: avoid overriding min_free_kbytes set by user has been removed from the -mm tree. Its filename was mm-khugepaged-avoid-overriding-min_free_kbytes-set-by-user.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Vijay Balakrishna Subject: mm: khugepaged: avoid overriding min_free_kbytes set by user set_recommended_min_free_kbytes need to honor min_free_kbytes set by the user. Post start-of-day THP enable or memory hotplug operations can lose user specified min_free_kbytes, in particular when it is higher than calculated recommended value. user_min_free_kbytes initialized to 0 to avoid undesired result when comparing with "unsigned long" type. Link: https://lkml.kernel.org/r/1600305709-2319-3-git-send-email-vijayb@linux.microsoft.com Signed-off-by: Vijay Balakrishna Reviewed-by: Pavel Tatashin Cc: Allen Pais Cc: Andrea Arcangeli Cc: "Kirill A. Shutemov" Cc: Michal Hocko Cc: Oleg Nesterov Cc: Song Liu Cc: Signed-off-by: Andrew Morton --- mm/khugepaged.c | 3 ++- mm/page_alloc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) --- a/mm/khugepaged.c~mm-khugepaged-avoid-overriding-min_free_kbytes-set-by-user +++ a/mm/khugepaged.c @@ -2283,7 +2283,8 @@ static void set_recommended_min_free_kby (unsigned long) nr_free_buffer_pages() / 20); recommended_min <<= (PAGE_SHIFT-10); - if (recommended_min > min_free_kbytes) { + if (recommended_min > min_free_kbytes || + recommended_min > user_min_free_kbytes) { if (user_min_free_kbytes >= 0) pr_info("raising min_free_kbytes from %d to %lu to help transparent hugepage allocations\n", min_free_kbytes, recommended_min); --- a/mm/page_alloc.c~mm-khugepaged-avoid-overriding-min_free_kbytes-set-by-user +++ a/mm/page_alloc.c @@ -315,7 +315,7 @@ compound_page_dtor * const compound_page }; int min_free_kbytes = 1024; -int user_min_free_kbytes = -1; +int user_min_free_kbytes = 0; #ifdef CONFIG_DISCONTIGMEM /* * DiscontigMem defines memory ranges as separate pg_data_t even if the ranges