From mboxrd@z Thu Jan 1 00:00:00 1970 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=-20.4 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham 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 E42F8C43461 for ; Thu, 17 Sep 2020 06:39:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7DADB20707 for ; Thu, 17 Sep 2020 06:39:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="cw77qORA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7DADB20707 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DDE0A6B0003; Thu, 17 Sep 2020 02:39:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DB4A96B0037; Thu, 17 Sep 2020 02:39:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF2C96B0055; Thu, 17 Sep 2020 02:39:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0094.hostedemail.com [216.40.44.94]) by kanga.kvack.org (Postfix) with ESMTP id B961B6B0003 for ; Thu, 17 Sep 2020 02:39:45 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 706721EFD for ; Thu, 17 Sep 2020 06:39:45 +0000 (UTC) X-FDA: 77271602730.06.flock05_0e1157827120 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id 40B3D100CE7D8 for ; Thu, 17 Sep 2020 06:39:45 +0000 (UTC) X-HE-Tag: flock05_0e1157827120 X-Filterd-Recvd-Size: 3163 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Thu, 17 Sep 2020 06:39:44 +0000 (UTC) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id C80A320B7178; Wed, 16 Sep 2020 23:39:43 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com C80A320B7178 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1600324783; bh=C0yXqA9MABixnZKvBzCZqn+aF9sH3ou4SdV6tgq3c9Q=; h=From:To:Cc:Subject:Date:From; b=cw77qORAvmzi4GDZVA1d44koWi7i8vgGCf9zFG43D4alwOQv+fKyYo3Q86slPDR6H 0OBq3SFegkdeoHbW2KMq1eIhoTPgG4CtGDxFxFAJhg9ip2YAGEENvfkvv4rJTTVBCn 0mO70eRjalRWKzsQpVgvFzikYQwcejfwGaKwOps4= From: Vijay Balakrishna To: Andrew Morton , "Kirill A. Shutemov" , Oleg Nesterov , Song Liu , Andrea Arcangeli , Pavel Tatashin , Vijay Balakrishna , Michal Hocko , Allen Pais Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [v4] mm: khugepaged: avoid overriding min_free_kbytes set by user Date: Wed, 16 Sep 2020 23:39:39 -0700 Message-Id: <1600324779-6782-1-git-send-email-vijayb@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 X-Rspamd-Queue-Id: 40B3D100CE7D8 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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. Signed-off-by: Vijay Balakrishna Cc: stable@vger.kernel.org Reviewed-by: Pavel Tatashin --- mm/khugepaged.c | 3 ++- mm/page_alloc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 4f7107476a6f..888802e85162 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2283,7 +2283,8 @@ static void set_recommended_min_free_kbytes(void) (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); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index fab5e97dc9ca..472646aef477 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -315,7 +315,7 @@ compound_page_dtor * const compound_page_dtors[NR_COMPOUND_DTORS] = { }; int min_free_kbytes = 1024; -int user_min_free_kbytes = -1; +int user_min_free_kbytes; #ifdef CONFIG_DISCONTIGMEM /* * DiscontigMem defines memory ranges as separate pg_data_t even if the ranges -- 2.28.0