From patchwork Mon Dec 4 23:49:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 13479207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAE69C10DCE for ; Mon, 4 Dec 2023 23:49:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 28E4D6B0088; Mon, 4 Dec 2023 18:49:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 23E1C6B0089; Mon, 4 Dec 2023 18:49:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 091276B008A; Mon, 4 Dec 2023 18:49:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CE4966B0089 for ; Mon, 4 Dec 2023 18:49:25 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id ADBC21C069C for ; Mon, 4 Dec 2023 23:49:25 +0000 (UTC) X-FDA: 81530779890.27.EA56574 Received: from 66-220-144-179.mail-mxout.facebook.com (66-220-144-179.mail-mxout.facebook.com [66.220.144.179]) by imf05.hostedemail.com (Postfix) with ESMTP id 105B0100009 for ; Mon, 4 Dec 2023 23:49:23 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; spf=neutral (imf05.hostedemail.com: 66.220.144.179 is neither permitted nor denied by domain of shr@devkernel.io) smtp.mailfrom=shr@devkernel.io; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701733764; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lSOH/I2hSe0+XvfrQBNIjBmF6L0o2lUHd9hlQ8s2gkY=; b=S+JdyIQb3r7F1aw1fFTun7qWEhVYq6GO37kvuS/2Wh+XT2YujV7aACtN79bc7KerYx5gqF KpS6lwADFSpExbRWsPg2fUi9xthFzDezUpYWz7BwahTQ823L3jDu4eV4GKXRYsZPlbB0zP UwYwUFWi1vzzMMbtTPvssas5o0g/pIs= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; spf=neutral (imf05.hostedemail.com: 66.220.144.179 is neither permitted nor denied by domain of shr@devkernel.io) smtp.mailfrom=shr@devkernel.io; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701733764; a=rsa-sha256; cv=none; b=Zky2NJvAIkRpGt8q6Iw9Zf7SPzthjRx7pneKypIsFInpUXecFiYJg/RbDsR4VoaHTVHViA LWNtVUyhdo8qGMJFA0O/SFt7j4659J4ioUC+t+7UALx7AdMU9mkZQ8FOdwZCl9jakCMib4 wtTP8DplV2gSWQi6IgukKoH99QItkRQ= Received: by devbig1114.prn1.facebook.com (Postfix, from userid 425415) id E345C105D3A87; Mon, 4 Dec 2023 15:49:09 -0800 (PST) From: Stefan Roesch To: kernel-team@fb.com Cc: shr@devkernel.io, akpm@linux-foundation.org, david@redhat.com, hannes@cmpxchg.org, riel@surriel.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v3 2/4] mm/ksm: add sysfs knobs for advisor Date: Mon, 4 Dec 2023 15:49:04 -0800 Message-Id: <20231204234906.1237478-3-shr@devkernel.io> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231204234906.1237478-1-shr@devkernel.io> References: <20231204234906.1237478-1-shr@devkernel.io> MIME-Version: 1.0 X-Rspamd-Queue-Id: 105B0100009 X-Rspam-User: X-Stat-Signature: tf1t67n4hbhrynt4srmdjdjqw1comt3w X-Rspamd-Server: rspam01 X-HE-Tag: 1701733763-449779 X-HE-Meta: U2FsdGVkX18vMBafwcYTqg+JqD+HoEOVkp25sExIN7pjtGP0yJHNxC16tcLOhggqT2lXJ7sNWxMrxL4TZC2uzOlz5jMyQD2Wlu4KA8u+/YAJZyhYf+1jRqui2+MXF5mqaeaI4uVZeuSBbnGJ08fW0+MnXVxgqKktZft7NFSuibOQQe/nCPyGqHrhNnLBinhqq6OQ+O6+dNb3TJSMnn98LJ+jXlEWuR9K4jmR2wTkglt21dJVetPHz1PUPxt7ERhTgiGed1vtwdnyK9bXgtYrKd7HcHfFpAniEeIv+Lf/2d5Y1Tvyp+DS/3PvZfkmdcDCAlFrb8S9XyO+HiP3pYX/xHhlM+b7rNOk8iJr1msl7geXf8EhCGIsufBuo4Cz6Tq6s/+6CpYKyPVRpN/xOkJh8Mpi5fc7To7kYXEFLKkSj2cksUoyZ9TlF6gZTLwxwiGG2e4tXmMAEWrZITiDznsO0NsQYz0D49dL/pSPTfk49L0L/yc7Z5npu3ZKMKCefWsIQxgLa8KAxuigGEN/R6FW4q1nV2A3wBDTQWKj+fM62hZzsPjtEZ2wTohihoeq3RzwKwysv7U/IJNPGEvnMs7qxrTZqiJTvkCrlwU8JysyPUcmz/EPfBIY5WXIkKd7Q3JmlS+DZTEBUOWvJERxxKrCO/sw7KUY+ZJuDnLLCGjhhppWZzlNyl6vwH5TPcm1WtfkH5dmAJr9wGawgZVdOcyAaCOOTfjDiggD69BugAriK11YlwkRwRfmEMas7VFFeHr8lqlsa9i0gcNtDeV3BScnbZyn2jm/qhQOC9AyXl9SXYS8CZChYbmoSXU6gpXzba8QLb0Khbx0yKuKRXc3I9pmxgoL0O43071/ZIu42+biPHP7crEn1o7c5VIutwoaDqgW5rmJ9jm8WJo0VoF2L1FfzxRK/6wO/Ve1YmjrKNRIc/eB6L3d+IxY6NeY19Ut4YqcYhW1pfIZRtyhgiv6UP5 xFfwopg/ oHtIbMPU+f2KUCIan9MJWTN7K4Q== 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: List-Subscribe: List-Unsubscribe: This adds four new knobs for the KSM advisor to influence its behaviour. The knobs are: - advisor_mode: none: no advisor (default) scan-time: scan time advisor - advisor_max_cpu: 70 (default, cpu usage percent) - advisor_min_pages: 500 (default) - advisor_max_pages: 30000 (default) - advisor_target_scan_time: 200 (default in seconds) The new values will take effect on the next scan round. Signed-off-by: Stefan Roesch --- mm/ksm.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/mm/ksm.c b/mm/ksm.c index b27010fa2e946..18b7185bbc65b 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -3735,6 +3735,128 @@ static ssize_t smart_scan_store(struct kobject *kobj, } KSM_ATTR(smart_scan); +static ssize_t advisor_mode_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + const char *output; + + if (ksm_advisor == KSM_ADVISOR_NONE) + output = "[none] scan-time"; + else if (ksm_advisor == KSM_ADVISOR_SCAN_TIME) + output = "none [scan-time]"; + + return sysfs_emit(buf, "%s\n", output); +} + +static ssize_t advisor_mode_store(struct kobject *kobj, + struct kobj_attribute *attr, const char *buf, + size_t count) +{ + if (sysfs_streq("scan-time", buf)) + ksm_advisor = KSM_ADVISOR_SCAN_TIME; + else if (sysfs_streq("none", buf)) + ksm_advisor = KSM_ADVISOR_NONE; + else + return -EINVAL; + + /* Set advisor default values */ + init_advisor(); + set_advisor_defaults(); + + return count; +} +KSM_ATTR(advisor_mode); + +static ssize_t advisor_max_cpu_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%u\n", ksm_advisor_max_cpu); +} + +static ssize_t advisor_max_cpu_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int err; + unsigned long value; + + err = kstrtoul(buf, 10, &value); + if (err) + return -EINVAL; + + ksm_advisor_max_cpu = value; + return count; +} +KSM_ATTR(advisor_max_cpu); + +static ssize_t advisor_min_pages_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%lu\n", ksm_advisor_min_pages); +} + +static ssize_t advisor_min_pages_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int err; + unsigned long value; + + err = kstrtoul(buf, 10, &value); + if (err) + return -EINVAL; + + ksm_advisor_min_pages = value; + return count; +} +KSM_ATTR(advisor_min_pages); + +static ssize_t advisor_max_pages_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%lu\n", ksm_advisor_max_pages); +} + +static ssize_t advisor_max_pages_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int err; + unsigned long value; + + err = kstrtoul(buf, 10, &value); + if (err) + return -EINVAL; + + ksm_advisor_max_pages = value; + return count; +} +KSM_ATTR(advisor_max_pages); + +static ssize_t advisor_target_scan_time_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%lu\n", ksm_advisor_target_scan_time); +} + +static ssize_t advisor_target_scan_time_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int err; + unsigned long value; + + err = kstrtoul(buf, 10, &value); + if (err) + return -EINVAL; + if (value < 1) + return -EINVAL; + + ksm_advisor_target_scan_time = value; + return count; +} +KSM_ATTR(advisor_target_scan_time); + static struct attribute *ksm_attrs[] = { &sleep_millisecs_attr.attr, &pages_to_scan_attr.attr, @@ -3757,6 +3879,11 @@ static struct attribute *ksm_attrs[] = { &use_zero_pages_attr.attr, &general_profit_attr.attr, &smart_scan_attr.attr, + &advisor_mode_attr.attr, + &advisor_max_cpu_attr.attr, + &advisor_min_pages_attr.attr, + &advisor_max_pages_attr.attr, + &advisor_target_scan_time_attr.attr, NULL, };