From patchwork Fri Jan 13 11:12:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 13100526 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 A8149C54EBE for ; Fri, 13 Jan 2023 11:13:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20F588E0006; Fri, 13 Jan 2023 06:13:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BFA38E0001; Fri, 13 Jan 2023 06:13:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0AE758E0006; Fri, 13 Jan 2023 06:13:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id F29968E0001 for ; Fri, 13 Jan 2023 06:13:01 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CE0CB1A0515 for ; Fri, 13 Jan 2023 11:13:01 +0000 (UTC) X-FDA: 80349513762.08.3DD53DE Received: from outbound-smtp15.blacknight.com (outbound-smtp15.blacknight.com [46.22.139.232]) by imf28.hostedemail.com (Postfix) with ESMTP id 26093C001C for ; Fri, 13 Jan 2023 11:12:59 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf28.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.139.232 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673608380; 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=4dtuJMuLjAPooRkMDKhq25jF6dppLdwvssJeQCbIWts=; b=wzYQDslQBGajxpvtAuWGfEyvfUlvxGX0NLISthv5OAICDPZ7WjRW/qc6aqeH6lS7M0dgSG PxCokVoXfQf6O9WFGQ3PICNXZAYYG+9V5OQ5V+s0xYmd66JqrMIyzqeMGHnzuXW9Tw2O4E amfTH4Cht+HAgEi0eiJkJ/bQ1bFJOtM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf28.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.139.232 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673608380; a=rsa-sha256; cv=none; b=mC7eYjxDQqxGMYhsmwOnEkeZ90DpqDBoR8RzpFwJaavXUL9ARf5RQGA6n3vaGmvKiWWsJ6 thJ0EJTrrj2mEjSYGXFwGRcoEkiDdtEP9OYPVef4RK2HmMlMwybgQCb5TFiOLqWwzBrCps eR1H8G/uefx2WWH5SHCjJmtjC4vwVT4= Received: from mail.blacknight.com (pemlinmail02.blacknight.ie [81.17.254.11]) by outbound-smtp15.blacknight.com (Postfix) with ESMTPS id 999EB1C42ED for ; Fri, 13 Jan 2023 11:12:58 +0000 (GMT) Received: (qmail 9751 invoked from network); 13 Jan 2023 11:12:58 -0000 Received: from unknown (HELO morpheus.112glenside.lan) (mgorman@techsingularity.net@[84.203.198.246]) by 81.17.254.9 with ESMTPA; 13 Jan 2023 11:12:58 -0000 From: Mel Gorman To: Andrew Morton Cc: Michal Hocko , NeilBrown , Thierry Reding , Matthew Wilcox , Vlastimil Babka , Linux-MM , LKML , Mel Gorman Subject: [PATCH 3/6] mm/page_alloc: Explicitly record high-order atomic allocations in alloc_flags Date: Fri, 13 Jan 2023 11:12:14 +0000 Message-Id: <20230113111217.14134-4-mgorman@techsingularity.net> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230113111217.14134-1-mgorman@techsingularity.net> References: <20230113111217.14134-1-mgorman@techsingularity.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 26093C001C X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 3t7ci5c63ub4f5f6t6o5npqhqwkqrndt X-HE-Tag: 1673608379-123919 X-HE-Meta: U2FsdGVkX19Ej9XLmIAksicCPRniYy4WmobM+m/SirPw88ZuEqKy4vnuk4FFFlEasGUZuiBVmJ8L0Nz+OIMiE2oZvEPY2AWXOEwQJcAMAyeUlCdyQqF1iJeKC3zB3IvrLbAocSBxCq5yUfpgs4gN4pHGj//9Ue9Ycnzcnn65gULTJeijxAd2SW1QD2iIn7hp3Xm+RlAM8e+XU0IwE8/0VxUWSNi7fRC4fBSMwS3Zg8augtuZkpplFDWOcEj8Bpxl5LvZJf40tcZ71bmKL1HdlXUqQBiDeGsBNotxqgmYVANyftNdvW68Uo4tP4Tu/J4/wfxJf34K62+A3KOspLKJZVv37lSeSGqKkuZxSxQYWn+/9Czq/cUOYHeFtHqudRpxxBXiN1DuEjA4kicPOTZYAAvnQQrjOCt6zAkctLn0Q1beCxTpznrWjTt19dwGmptfTy9lapofs6R4xy9c0UBH+r0qBd9uzoAuZuwvdZ3riRAvpfK0tGRdjNHOXD4JvAsyNXSBW9chBvwKOpSnlef2pOrH1LgT6D9IA3s2ISNmQVSreQVnsdHFh45FsW227ic5OAwMOxEI5QoStROuuRDB2JYW0v69cPdSkZktjSJI2C0hhqPI0uN3njvTkvmkyc5oTGtc2FMswHiuKc+rKmmIFDPFQBzzFTmgN8ISBIOjUWF93LCblQCJfhk39RKX+mXKSrVe0S4kgWrinC6YUs+soEyDgbyioykFloFRUaRpn7RDo0sP2MjIXjh8TWpZQDIbE91eKYMYvrkBnY7TtIyrdon4z7JEsp4lYe5kr32Ro0w0pghTJiLCAT/uJo3c8QpIcJgBJEnLNj9cKVYK/k9JM9LTz40bmotruPpJlApSeISCuVbhcBaKdvzUDKdPGAFqRao+x1EsH294P3AxdV97tRUoAmSqVuGKYez5cnyRtXbVVXa5oJq1aOyS1nBJqCZn13hLuHcXqgY55fZO9lM K4RedF9Y DfNrTJe7LegiiaZpgHkhjEs1/pmCx9wcR83J67SF1gdAML9v9lpBxeBTEoLR36INEV3jS 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: A high-order ALLOC_HARDER allocation is assumed to be atomic. While that is accurate, it changes later in the series. In preparation, explicitly record high-order atomic allocations in gfp_to_alloc_flags(). Signed-off-by: Mel Gorman Acked-by: Vlastimil Babka Acked-by: Michal Hocko --- mm/internal.h | 1 + mm/page_alloc.c | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 403e4386626d..178484d9fd94 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -746,6 +746,7 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, #else #define ALLOC_NOFRAGMENT 0x0 #endif +#define ALLOC_HIGHATOMIC 0x200 /* Allows access to MIGRATE_HIGHATOMIC */ #define ALLOC_KSWAPD 0x800 /* allow waking of kswapd, __GFP_KSWAPD_RECLAIM set */ enum ttu_flags; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0040b4e00913..0ef4f3236a5a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3706,10 +3706,20 @@ struct page *rmqueue_buddy(struct zone *preferred_zone, struct zone *zone, * reserved for high-order atomic allocation, so order-0 * request should skip it. */ - if (order > 0 && alloc_flags & ALLOC_HARDER) + if (alloc_flags & ALLOC_HIGHATOMIC) page = __rmqueue_smallest(zone, order, MIGRATE_HIGHATOMIC); if (!page) { page = __rmqueue(zone, order, migratetype, alloc_flags); + + /* + * If the allocation fails, allow OOM handling access + * to HIGHATOMIC reserves as failing now is worse than + * failing a high-order atomic allocation in the + * future. + */ + if (!page && (alloc_flags & ALLOC_OOM)) + page = __rmqueue_smallest(zone, order, MIGRATE_HIGHATOMIC); + if (!page) { spin_unlock_irqrestore(&zone->lock, flags); return NULL; @@ -4023,8 +4033,10 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, return true; } #endif - if (alloc_harder && !free_area_empty(area, MIGRATE_HIGHATOMIC)) + if ((alloc_flags & (ALLOC_HIGHATOMIC|ALLOC_OOM)) && + !free_area_empty(area, MIGRATE_HIGHATOMIC)) { return true; + } } return false; } @@ -4286,7 +4298,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags, * If this is a high-order atomic allocation then check * if the pageblock should be reserved for the future */ - if (unlikely(order && (alloc_flags & ALLOC_HARDER))) + if (unlikely(alloc_flags & ALLOC_HIGHATOMIC)) reserve_highatomic_pageblock(page, zone, order); return page; @@ -4813,7 +4825,7 @@ static void wake_all_kswapds(unsigned int order, gfp_t gfp_mask, } static inline unsigned int -gfp_to_alloc_flags(gfp_t gfp_mask) +gfp_to_alloc_flags(gfp_t gfp_mask, unsigned int order) { unsigned int alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET; @@ -4839,8 +4851,13 @@ gfp_to_alloc_flags(gfp_t gfp_mask) * Not worth trying to allocate harder for __GFP_NOMEMALLOC even * if it can't schedule. */ - if (!(gfp_mask & __GFP_NOMEMALLOC)) + if (!(gfp_mask & __GFP_NOMEMALLOC)) { alloc_flags |= ALLOC_HARDER; + + if (order > 0) + alloc_flags |= ALLOC_HIGHATOMIC; + } + /* * Ignore cpuset mems for GFP_ATOMIC rather than fail, see the * comment for __cpuset_node_allowed(). @@ -5048,7 +5065,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, * kswapd needs to be woken up, and to avoid the cost of setting up * alloc_flags precisely. So we do that now. */ - alloc_flags = gfp_to_alloc_flags(gfp_mask); + alloc_flags = gfp_to_alloc_flags(gfp_mask, order); /* * We need to recalculate the starting point for the zonelist iterator