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,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 E8F34C433E2 for ; Tue, 15 Sep 2020 21:11:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3F12520795 for ; Tue, 15 Sep 2020 21:11:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="adZiRDEA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F12520795 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 9230A900050; Tue, 15 Sep 2020 17:11:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 907F1900063; Tue, 15 Sep 2020 17:11:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80F3A900050; Tue, 15 Sep 2020 17:11:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0038.hostedemail.com [216.40.44.38]) by kanga.kvack.org (Postfix) with ESMTP id 6C9B6900012 for ; Tue, 15 Sep 2020 17:11:04 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 268323489 for ; Tue, 15 Sep 2020 21:11:04 +0000 (UTC) X-FDA: 77266540848.14.hill88_2a070de27114 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id F3B0418229818 for ; Tue, 15 Sep 2020 21:11:03 +0000 (UTC) X-HE-Tag: hill88_2a070de27114 X-Filterd-Recvd-Size: 3546 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Sep 2020 21:11:03 +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 7BBC620A115B; Tue, 15 Sep 2020 14:11:02 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7BBC620A115B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1600204262; bh=7xajAEpRfasIvIA9qX7Nw/+zwdXKydGaiUOrgh4P5wo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=adZiRDEA3132WzypO//6vmLB/t2g1KuZTJvpfaWOrPVwCWEcJfnt+lBmOwJ76yZt6 QQPBDIEbGprHvAVudVndd8a2sg4vp+WOSsUd0aMjTQ6a6piwJzopk/eY84aeh7uGVN URbEjN848tTQOUzEnZYLcJeBnt3apSqQShtozDN8= 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: [v2 2/2] mm: khugepaged: avoid overriding min_free_kbytes set by user Date: Tue, 15 Sep 2020 14:10:58 -0700 Message-Id: <1600204258-13683-2-git-send-email-vijayb@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1600204258-13683-1-git-send-email-vijayb@linux.microsoft.com> References: <1600204258-13683-1-git-send-email-vijayb@linux.microsoft.com> X-Rspamd-Queue-Id: F3B0418229818 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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. Also modifying "recommended_min" variable type to "int" from "unsigned long" to avoid undesired result noticed during testing. It is due to comparing "unsigned long" with "int" type. Signed-off-by: Vijay Balakrishna Cc: stable@vger.kernel.org Reviewed-by: Pavel Tatashin --- mm/khugepaged.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 4f7107476a6f..b4b753ba411a 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2253,7 +2253,7 @@ static void set_recommended_min_free_kbytes(void) { struct zone *zone; int nr_zones = 0; - unsigned long recommended_min; + int recommended_min; for_each_populated_zone(zone) { /* @@ -2280,12 +2280,12 @@ static void set_recommended_min_free_kbytes(void) /* don't ever allow to reserve more than 5% of the lowmem */ recommended_min = min(recommended_min, - (unsigned long) nr_free_buffer_pages() / 20); + (int) nr_free_buffer_pages() / 20); recommended_min <<= (PAGE_SHIFT-10); - if (recommended_min > min_free_kbytes) { + if (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", + pr_info("raising min_free_kbytes from %d to %d to help transparent hugepage allocations\n", min_free_kbytes, recommended_min); min_free_kbytes = recommended_min; -- 2.28.0