From patchwork Mon May 8 07:11:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13234123 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 BDFFFC7EE2A for ; Mon, 8 May 2023 06:55:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C83FC280002; Mon, 8 May 2023 02:54:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0FFA900002; Mon, 8 May 2023 02:54:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A407C280002; Mon, 8 May 2023 02:54:56 -0400 (EDT) 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 7EB05900005 for ; Mon, 8 May 2023 02:54:56 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 558E440913 for ; Mon, 8 May 2023 06:54:56 +0000 (UTC) X-FDA: 80766175392.21.CA602FA Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf20.hostedemail.com (Postfix) with ESMTP id B81DA1C0007 for ; Mon, 8 May 2023 06:54:53 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf20.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683528894; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s9vHq5TJy8H0Afs6oNs06skkih4nirqHggAvo3Vlzgw=; b=0uUfKEnneGTBN1samhUD0Cw3MhUDOmSqr+7YFudqiVLvHnUKwVH6UckdFkT2F26i0UwljZ IqOmNZN20F9BDL5oqjvsDLcD6hFOLcJepWKyLCsoIi94hHGAElnxN4KPCE2wlkQCkcP6ot eL+iXCoXa2bpoG/AEkQI15i5MaoeX/g= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf20.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683528894; a=rsa-sha256; cv=none; b=KNhVuZBPIExDutwxPjQ3ugr3yV59qctCj9xh81kAm/bwG8mDq2BrlZcehiuP3JM4LtPSsT 8KbPdZ96SvpD5FGdTdQN9kH++Fig9CQoZ/3t8fN35BAGcTWqYJ5+T3573UAVztnzEaGe4P g4WcE1tuvl+YTwfqT8qht9Vnwn0jZd0= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QFBmK4B1vzLpB0; Mon, 8 May 2023 14:52:01 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 8 May 2023 14:54:50 +0800 From: Kefeng Wang To: Andrew Morton , Mike Rapoport , CC: David Hildenbrand , Oscar Salvador , "Rafael J. Wysocki" , Pavel Machek , Len Brown , Luis Chamberlain , Kees Cook , Iurii Zaikin , , , , Kefeng Wang Subject: [PATCH 07/12] mm: page_alloc: split out FAIL_PAGE_ALLOC Date: Mon, 8 May 2023 15:11:55 +0800 Message-ID: <20230508071200.123962-8-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230508071200.123962-1-wangkefeng.wang@huawei.com> References: <20230508071200.123962-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Stat-Signature: dmq9fs43wtqwg747p7pkned6agdmid1x X-Rspam-User: X-Rspamd-Queue-Id: B81DA1C0007 X-Rspamd-Server: rspam07 X-HE-Tag: 1683528893-980875 X-HE-Meta: U2FsdGVkX18Ok6A7HYRGId9MAnxX1si/ma7fg5e93GGm3vrpxK2/F+grflK45a3f+t1vSUNP5ern2fyPEB60vE28NPwa9p0fsVtzK7zi2lbYnhmV6ZZ+7ntgZdGdJTyK7XbM3N0PgA17sbZn4P4SrvxguFnnB1yg5meoShocjsD7Rsc96dzQelE0YN2ngoAGGHLnbmbwVSxhMQl4IrDvyQDn7+yF0f83qj3eiF+5Po/5mqMa+DhOvFhuXNmAN/EAKk01t7muA+PnFLWpjiHOzSG35TOZTTV3lrlr+y49MqHrQauunTpTF9XcoaIu9sN4QNeZ3JstMZdcbgDEBXbglXy87udeBdGtMjX0HISrKN2AZOwC4xvLHjh0SLpyWEkmdFif0YYqGBXyiDbuDGeL7p3VhH2oq8m6gHgvRutXSXnBZxJ0KLJgbESGr2vLGWHaYAhN3CuorMk7Rp0hMR1AFgDQiolwKihoquXd/NklRajIQW8n9fXe3Mfp+qaY2z+I6UVt10k1MUDT0fvtJaYBbGzusyHf7a0rH3MHzMRKp6C2x5u5OEs2zpXpoZDO06kpkWyteNoSfzj70zGV9K60ef5nu3PPxCFUDssk0D5+00aiy/gZMvx00f1bNteKwD9IUcrdE/cdzywtnsk8gYyfqjBxKOVUcyemdb3lFAu+RqgrppxuN1FS1ADd7NI134Z5yvUrA6Ioda0IE7Pyeh+JfMjnP4U/KQ3Zz2GSIGsYJC6mU2TYdCR79aScThL7W6uH3FfkKhAVhj+i4XDkGw/4Dp5n930YA1P+nUfyNDD+G0G+oAbvVU9sfPLbW7zFmAM6rcvMi/i16foC+AgDozLb4sgI5rvir9skL/IRrgwgwimuUs7jJKVOMnoPuKJF8975zIhWA2vM9IpE/mykHDNQNiPE/bwEKX3KzlvVGrFhnH5996qAWerzKlxheW3g+6HqXdP/ge7eRWLzHNlr4t5 UeyglEtJ l/d0NDniUnioHzGUmw8o1NX9rKJbT7hkAUzmFnqg2BiNAgyq5LsYXaWagStXOzu9r8R5FEEMikcjpEQpsQxO3WmFJ5GwBd/UVsDXkBN2vzQABjfG6cDnwwqPwPDsHe0u/oruZKOn/e7aoiq6ksGMoKE8OKI2ehdMQiEIRfdxykOCLugQjviCBjJ+jyQ/TViNRL2r7QV4hTIBBvpQ= 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: ... to a single file to reduce a bit of page_alloc.c. Signed-off-by: Kefeng Wang --- include/linux/fault-inject.h | 9 +++++ mm/Makefile | 1 + mm/fail_page_alloc.c | 66 ++++++++++++++++++++++++++++++++ mm/page_alloc.c | 74 ------------------------------------ 4 files changed, 76 insertions(+), 74 deletions(-) create mode 100644 mm/fail_page_alloc.c diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h index 481abf530b3c..6d5edef09d45 100644 --- a/include/linux/fault-inject.h +++ b/include/linux/fault-inject.h @@ -93,6 +93,15 @@ struct kmem_cache; bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order); +#ifdef CONFIG_FAIL_PAGE_ALLOC +bool __should_fail_alloc_page(gfp_t gfp_mask, unsigned int order); +#else +static inline bool __should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) +{ + return false; +} +#endif /* CONFIG_FAIL_PAGE_ALLOC */ + int should_failslab(struct kmem_cache *s, gfp_t gfpflags); #ifdef CONFIG_FAILSLAB extern bool __should_failslab(struct kmem_cache *s, gfp_t gfpflags); diff --git a/mm/Makefile b/mm/Makefile index 5262ce5baa28..0eec4bc72d3f 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -89,6 +89,7 @@ obj-$(CONFIG_KASAN) += kasan/ obj-$(CONFIG_KFENCE) += kfence/ obj-$(CONFIG_KMSAN) += kmsan/ obj-$(CONFIG_FAILSLAB) += failslab.o +obj-$(CONFIG_FAIL_PAGE_ALLOC) += fail_page_alloc.o obj-$(CONFIG_MEMTEST) += memtest.o obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_NUMA) += memory-tiers.o diff --git a/mm/fail_page_alloc.c b/mm/fail_page_alloc.c new file mode 100644 index 000000000000..b1b09cce9394 --- /dev/null +++ b/mm/fail_page_alloc.c @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include + +static struct { + struct fault_attr attr; + + bool ignore_gfp_highmem; + bool ignore_gfp_reclaim; + u32 min_order; +} fail_page_alloc = { + .attr = FAULT_ATTR_INITIALIZER, + .ignore_gfp_reclaim = true, + .ignore_gfp_highmem = true, + .min_order = 1, +}; + +static int __init setup_fail_page_alloc(char *str) +{ + return setup_fault_attr(&fail_page_alloc.attr, str); +} +__setup("fail_page_alloc=", setup_fail_page_alloc); + +bool __should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) +{ + int flags = 0; + + if (order < fail_page_alloc.min_order) + return false; + if (gfp_mask & __GFP_NOFAIL) + return false; + if (fail_page_alloc.ignore_gfp_highmem && (gfp_mask & __GFP_HIGHMEM)) + return false; + if (fail_page_alloc.ignore_gfp_reclaim && + (gfp_mask & __GFP_DIRECT_RECLAIM)) + return false; + + /* See comment in __should_failslab() */ + if (gfp_mask & __GFP_NOWARN) + flags |= FAULT_NOWARN; + + return should_fail_ex(&fail_page_alloc.attr, 1 << order, flags); +} + +#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS + +static int __init fail_page_alloc_debugfs(void) +{ + umode_t mode = S_IFREG | 0600; + struct dentry *dir; + + dir = fault_create_debugfs_attr("fail_page_alloc", NULL, + &fail_page_alloc.attr); + + debugfs_create_bool("ignore-gfp-wait", mode, dir, + &fail_page_alloc.ignore_gfp_reclaim); + debugfs_create_bool("ignore-gfp-highmem", mode, dir, + &fail_page_alloc.ignore_gfp_highmem); + debugfs_create_u32("min-order", mode, dir, &fail_page_alloc.min_order); + + return 0; +} + +late_initcall(fail_page_alloc_debugfs); + +#endif /* CONFIG_FAULT_INJECTION_DEBUG_FS */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bc453edbad21..fce47ccbcb3a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2942,80 +2942,6 @@ struct page *rmqueue(struct zone *preferred_zone, return page; } -#ifdef CONFIG_FAIL_PAGE_ALLOC - -static struct { - struct fault_attr attr; - - bool ignore_gfp_highmem; - bool ignore_gfp_reclaim; - u32 min_order; -} fail_page_alloc = { - .attr = FAULT_ATTR_INITIALIZER, - .ignore_gfp_reclaim = true, - .ignore_gfp_highmem = true, - .min_order = 1, -}; - -static int __init setup_fail_page_alloc(char *str) -{ - return setup_fault_attr(&fail_page_alloc.attr, str); -} -__setup("fail_page_alloc=", setup_fail_page_alloc); - -static bool __should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) -{ - int flags = 0; - - if (order < fail_page_alloc.min_order) - return false; - if (gfp_mask & __GFP_NOFAIL) - return false; - if (fail_page_alloc.ignore_gfp_highmem && (gfp_mask & __GFP_HIGHMEM)) - return false; - if (fail_page_alloc.ignore_gfp_reclaim && - (gfp_mask & __GFP_DIRECT_RECLAIM)) - return false; - - /* See comment in __should_failslab() */ - if (gfp_mask & __GFP_NOWARN) - flags |= FAULT_NOWARN; - - return should_fail_ex(&fail_page_alloc.attr, 1 << order, flags); -} - -#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS - -static int __init fail_page_alloc_debugfs(void) -{ - umode_t mode = S_IFREG | 0600; - struct dentry *dir; - - dir = fault_create_debugfs_attr("fail_page_alloc", NULL, - &fail_page_alloc.attr); - - debugfs_create_bool("ignore-gfp-wait", mode, dir, - &fail_page_alloc.ignore_gfp_reclaim); - debugfs_create_bool("ignore-gfp-highmem", mode, dir, - &fail_page_alloc.ignore_gfp_highmem); - debugfs_create_u32("min-order", mode, dir, &fail_page_alloc.min_order); - - return 0; -} - -late_initcall(fail_page_alloc_debugfs); - -#endif /* CONFIG_FAULT_INJECTION_DEBUG_FS */ - -#else /* CONFIG_FAIL_PAGE_ALLOC */ - -static inline bool __should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) -{ - return false; -} - -#endif /* CONFIG_FAIL_PAGE_ALLOC */ - noinline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) { return __should_fail_alloc_page(gfp_mask, order);