From patchwork Fri Mar 27 18:46:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1262945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48prSZ0Pnjz9sRY; Sat, 28 Mar 2020 05:47:26 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jHu0o-00018b-MQ; Fri, 27 Mar 2020 18:47:22 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jHu0k-00017o-Ib for kernel-team@lists.ubuntu.com; Fri, 27 Mar 2020 18:47:18 +0000 Received: from mail-wr1-f71.google.com ([209.85.221.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jHu0k-00065O-Aa for kernel-team@lists.ubuntu.com; Fri, 27 Mar 2020 18:47:18 +0000 Received: by mail-wr1-f71.google.com with SMTP id e10so4960974wru.6 for ; Fri, 27 Mar 2020 11:47:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=88mqSvzmWoeyiIilrRt1nvGTXHKc+uDGadvrFL/uEog=; b=fsyDe2lwWodATNums4Md45IbfDcP407952GeX4pp+oKt7CWccuAp+SOJKJO2sHj7y1 UMaBPTEnVc5es61V06uBfqkOLx90vl+GhXjRCYL0oI4g9nC7EEFNPWEQ9LC571PZOHhC ouhCDhgjuxC0osXvQyFzD9pFte9cwjaFtwgmryChZuONztQHYQ4Z9n7ZjhZg5kZgROrT C2KW0Qq7uQmxK+CLGd18f30M3RwqIg8EKc2qg2nxuAsvuuo2v3m548eIiNI75PbLPF+U YOHqxYA+roEBo4vPsydDXXUmFrGt5YUI0uB6prNrvE1whjc/6H0sQI1E1mQ40hFhSxBQ VY3Q== X-Gm-Message-State: ANhLgQ2crIjdPeh+sc0x19/tHxJZi5Va0dJYEzl2dfCIe47fk8y1YOGF V6rcymMB2a5/2Rz2nkD4lo4n3bsRUDry0e5tf4KomZTSVid10MGuu6aJVfThpJp3Ra2zCyIOvhH ZsxG/+bsOsv/XrPhdJYp6YLS+x5PuOdnlylQT+ZlHQw== X-Received: by 2002:adf:e98a:: with SMTP id h10mr871302wrm.370.1585334837762; Fri, 27 Mar 2020 11:47:17 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtwTjGyk5vjHKV5YayF3cSHtt4ige4TFLmUIJJjdeG0EngIY+858GmNvUuGai1Y5PyYy1Itmw== X-Received: by 2002:adf:e98a:: with SMTP id h10mr871284wrm.370.1585334837455; Fri, 27 Mar 2020 11:47:17 -0700 (PDT) Received: from xps-13.homenet.telecomitalia.it ([79.53.23.87]) by smtp.gmail.com with ESMTPSA id a13sm1780106wrt.64.2020.03.27.11.47.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:47:16 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: SAUCE: mm/page_alloc.c: disable memory reclaim watermark boosting by default Date: Fri, 27 Mar 2020 19:46:49 +0100 Message-Id: <20200327184648.1389388-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200327184648.1389388-1-andrea.righi@canonical.com> References: <20200327184648.1389388-1-andrea.righi@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1861359 High watermark boosting can cause large swap activity under certain memory intensive workloads, making the system very unresponsive (screen does not refresh, keyboard not responding, etc.). Disable this feature by default to prevent potential large swap activity. Signed-off-by: Sultan Alsawaf Signed-off-by: Andrea Righi Acked-by: Colin Ian King --- mm/page_alloc.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d387ca74cb5a..7ab52a62c5ef 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -315,20 +315,7 @@ compound_page_dtor * const compound_page_dtors[] = { int min_free_kbytes = 1024; int user_min_free_kbytes = -1; -#ifdef CONFIG_DISCONTIGMEM -/* - * DiscontigMem defines memory ranges as separate pg_data_t even if the ranges - * are not on separate NUMA nodes. Functionally this works but with - * watermark_boost_factor, it can reclaim prematurely as the ranges can be - * quite small. By default, do not boost watermarks on discontigmem as in - * many cases very high-order allocations like THP are likely to be - * unsupported and the premature reclaim offsets the advantage of long-term - * fragmentation avoidance. - */ int watermark_boost_factor __read_mostly; -#else -int watermark_boost_factor __read_mostly = 15000; -#endif int watermark_scale_factor = 10; static unsigned long nr_kernel_pages __initdata;