From patchwork Fri Oct 15 00:55:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 12559625 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C49FC433F5 for ; Fri, 15 Oct 2021 00:56:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A91A261139 for ; Fri, 15 Oct 2021 00:56:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A91A261139 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 326C26B006C; Thu, 14 Oct 2021 20:56:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D5D56B0071; Thu, 14 Oct 2021 20:56:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C4F8900002; Thu, 14 Oct 2021 20:56:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0067.hostedemail.com [216.40.44.67]) by kanga.kvack.org (Postfix) with ESMTP id 0BF9E6B006C for ; Thu, 14 Oct 2021 20:56:04 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id BE32E2D4DD for ; Fri, 15 Oct 2021 00:56:03 +0000 (UTC) X-FDA: 78696855006.23.D6E6ADF Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by imf24.hostedemail.com (Postfix) with ESMTP id 6EB22B000099 for ; Fri, 15 Oct 2021 00:56:02 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id d23so7066933pgh.8 for ; Thu, 14 Oct 2021 17:56:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cf0YEF0ffs7JzSE/VN26A0DuF3TU/TTCNqKkcWANbFg=; b=acGdJwLdUzEZKhKOIq696wCosceAlV5D86IYNJfArazzWo1VscUmSdzHD9YNLrLoRW IefG4LXQEuWvRnJSlk3bBCBMUJbFpL5n2tubsqWztc8nDnAqrRhkQQatqbUzbLobZrRd 9P+1RB/2Th4JHzJ5Q8oBu66IttX8uAx+3kKfhXVRa+uzF4xAH/Mg2ypYqhg3EU6JWDqg XN5rd72ZfW77YKiqn/nZcbFT7V+CC6xYyoDUuzmK9GnNBEttPjc3n2dytYj75ani9Wu2 Tz+vAkcUO1ieVkFP0h7JdURHPU4V277hgxIJix7RgqPFK5Zec/S50zLlhLakhQHnpXEj FLYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cf0YEF0ffs7JzSE/VN26A0DuF3TU/TTCNqKkcWANbFg=; b=cpuAmEvy8b67I2mvz3beBAgzjnSOsxnVYriCnmGoGXm1M0SEvApOvdAwMNGnmx2P5B NUJ2CsRrWf2Rs749KRllfXuijkP8IPig1iaulbwNNIgKNbxDN7qfMoYcrEyxXGkY8l8e woSxaGwJa78oeXI3FkcMIu2bb6M6SivpxfxABHKd4nm/xq6/TIcb+ylJAPhw+I4sTFHw npb8mVJNC6YwDXb5TbDch7ekBWFCeHZzE+eiDlVGk0bJUIQKEQUvO1FrhzFZYV2igrN6 MWVM3oePtkCrvDGO7FsFaz0cyfODWDd+wGfUAokak14jaTbTZz7kCfuLrOZA3cqZBn9o fetg== X-Gm-Message-State: AOAM530I8YjVjvsGZYJTbQ7RoZuhdeqcZDTRk7JZM4+0JAvT15rDazli bs88u1j7TYELBZeaCdsgbTg= X-Google-Smtp-Source: ABdhPJxmDAT8V2DIbTuAi6Hw2tzGCYsfAc7K8ijxMl0O7Hi8g4dFhXPaatfoklww/2n3Y97jACBkHg== X-Received: by 2002:a62:800a:0:b0:447:b73e:6e18 with SMTP id j10-20020a62800a000000b00447b73e6e18mr8390273pfd.28.1634259362429; Thu, 14 Oct 2021 17:56:02 -0700 (PDT) Received: from localhost.localdomain (c-73-93-239-127.hsd1.ca.comcast.net. [73.93.239.127]) by smtp.gmail.com with ESMTPSA id k9sm3510745pfa.88.2021.10.14.17.56.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 17:56:01 -0700 (PDT) From: Yang Shi To: ying.huang@intel.com, dave.hansen@linux.intel.com, akpm@linux-foundation.org Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: migrate: make demotion knob depend on migration Date: Thu, 14 Oct 2021 17:55:59 -0700 Message-Id: <20211015005559.246709-1-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=acGdJwLd; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of shy828301@gmail.com designates 209.85.215.179 as permitted sender) smtp.mailfrom=shy828301@gmail.com X-Stat-Signature: e7hi6n646cxz5xwaw63kbub3sc91fqd4 X-Rspamd-Queue-Id: 6EB22B000099 X-Rspamd-Server: rspam01 X-HE-Tag: 1634259362-969811 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: The memory demotion needs to call migrate_pages() to do the jobs. And it is controlled by a knob, however, the knob doesn't depend on CONFIG_MIGRATION. The knob could be truned on even though MIGRATION is disabled, this will not cause any crash since migrate_pages() would just return -ENOSYS. But it is definitely not optimal to go through demotion path then retry regular swap every time. And it doesn't make too much sense to have the knob visible to the users when !MIGRATION. Move the related code from mempolicy.[h|c] to migrate.[h|c]. Signed-off-by: Yang Shi Acked-by: "Huang, Ying" --- include/linux/mempolicy.h | 4 --- include/linux/migrate.h | 4 +++ mm/mempolicy.c | 61 --------------------------------------- mm/migrate.c | 61 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index 4091692bed8c..2bcb524dc339 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h @@ -184,8 +184,6 @@ extern bool vma_migratable(struct vm_area_struct *vma); extern int mpol_misplaced(struct page *, struct vm_area_struct *, unsigned long); extern void mpol_put_task_policy(struct task_struct *); -extern bool numa_demotion_enabled; - static inline bool mpol_is_preferred_many(struct mempolicy *pol) { return (pol->mode == MPOL_PREFERRED_MANY); @@ -301,8 +299,6 @@ static inline nodemask_t *policy_nodemask_current(gfp_t gfp) return NULL; } -#define numa_demotion_enabled false - static inline bool mpol_is_preferred_many(struct mempolicy *pol) { return false; diff --git a/include/linux/migrate.h b/include/linux/migrate.h index c8077e936691..eb8960683058 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -57,6 +57,8 @@ extern int migrate_huge_page_move_mapping(struct address_space *mapping, struct page *newpage, struct page *page); extern int migrate_page_move_mapping(struct address_space *mapping, struct page *newpage, struct page *page, int extra_count); + +extern bool numa_demotion_enabled; #else static inline void putback_movable_pages(struct list_head *l) {} @@ -82,6 +84,8 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping, { return -ENOSYS; } + +#define numa_demotion_enabled false #endif /* CONFIG_MIGRATION */ #ifdef CONFIG_COMPACTION diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 1592b081c58e..8f45d4191b5b 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2981,64 +2981,3 @@ void mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol) p += scnprintf(p, buffer + maxlen - p, ":%*pbl", nodemask_pr_args(&nodes)); } - -bool numa_demotion_enabled = false; - -#ifdef CONFIG_SYSFS -static ssize_t numa_demotion_enabled_show(struct kobject *kobj, - struct kobj_attribute *attr, char *buf) -{ - return sysfs_emit(buf, "%s\n", - numa_demotion_enabled? "true" : "false"); -} - -static ssize_t numa_demotion_enabled_store(struct kobject *kobj, - struct kobj_attribute *attr, - const char *buf, size_t count) -{ - if (!strncmp(buf, "true", 4) || !strncmp(buf, "1", 1)) - numa_demotion_enabled = true; - else if (!strncmp(buf, "false", 5) || !strncmp(buf, "0", 1)) - numa_demotion_enabled = false; - else - return -EINVAL; - - return count; -} - -static struct kobj_attribute numa_demotion_enabled_attr = - __ATTR(demotion_enabled, 0644, numa_demotion_enabled_show, - numa_demotion_enabled_store); - -static struct attribute *numa_attrs[] = { - &numa_demotion_enabled_attr.attr, - NULL, -}; - -static const struct attribute_group numa_attr_group = { - .attrs = numa_attrs, -}; - -static int __init numa_init_sysfs(void) -{ - int err; - struct kobject *numa_kobj; - - numa_kobj = kobject_create_and_add("numa", mm_kobj); - if (!numa_kobj) { - pr_err("failed to create numa kobject\n"); - return -ENOMEM; - } - err = sysfs_create_group(numa_kobj, &numa_attr_group); - if (err) { - pr_err("failed to register numa group\n"); - goto delete_obj; - } - return 0; - -delete_obj: - kobject_put(numa_kobj); - return err; -} -subsys_initcall(numa_init_sysfs); -#endif diff --git a/mm/migrate.c b/mm/migrate.c index a6a7743ee98f..55dccb995cfe 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -3294,3 +3294,64 @@ static int __init migrate_on_reclaim_init(void) } late_initcall(migrate_on_reclaim_init); #endif /* CONFIG_MEMORY_HOTPLUG */ + +bool numa_demotion_enabled = false; + +#ifdef CONFIG_SYSFS +static ssize_t numa_demotion_enabled_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%s\n", + numa_demotion_enabled? "true" : "false"); +} + +static ssize_t numa_demotion_enabled_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + if (!strncmp(buf, "true", 4) || !strncmp(buf, "1", 1)) + numa_demotion_enabled = true; + else if (!strncmp(buf, "false", 5) || !strncmp(buf, "0", 1)) + numa_demotion_enabled = false; + else + return -EINVAL; + + return count; +} + +static struct kobj_attribute numa_demotion_enabled_attr = + __ATTR(demotion_enabled, 0644, numa_demotion_enabled_show, + numa_demotion_enabled_store); + +static struct attribute *numa_attrs[] = { + &numa_demotion_enabled_attr.attr, + NULL, +}; + +static const struct attribute_group numa_attr_group = { + .attrs = numa_attrs, +}; + +static int __init numa_init_sysfs(void) +{ + int err; + struct kobject *numa_kobj; + + numa_kobj = kobject_create_and_add("numa", mm_kobj); + if (!numa_kobj) { + pr_err("failed to create numa kobject\n"); + return -ENOMEM; + } + err = sysfs_create_group(numa_kobj, &numa_attr_group); + if (err) { + pr_err("failed to register numa group\n"); + goto delete_obj; + } + return 0; + +delete_obj: + kobject_put(numa_kobj); + return err; +} +subsys_initcall(numa_init_sysfs); +#endif