From patchwork Fri Jan 13 11:12:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 13100527 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 F337FC54EBE for ; Fri, 13 Jan 2023 11:13:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 964808E0007; Fri, 13 Jan 2023 06:13:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9124A8E0001; Fri, 13 Jan 2023 06:13:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 828768E0007; Fri, 13 Jan 2023 06:13:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 752BB8E0001 for ; Fri, 13 Jan 2023 06:13:12 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 24F8B160883 for ; Fri, 13 Jan 2023 11:13:12 +0000 (UTC) X-FDA: 80349514224.20.F4F6001 Received: from outbound-smtp04.blacknight.com (outbound-smtp04.blacknight.com [81.17.249.35]) by imf18.hostedemail.com (Postfix) with ESMTP id 2F5D61C000B for ; Fri, 13 Jan 2023 11:13:09 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf18.hostedemail.com: domain of mgorman@techsingularity.net designates 81.17.249.35 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=1673608390; 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=vABlLWU4vOV7PbsFCMQ7RZft5Uue6QSR/R93b7+7cFQ=; b=nBGcntoL19rUpaULMzELgNG3Tdj2D+9Vn6PU2tlUXIytOJ45/K9EIwx6KHZpC6jfIw2E2F iVRxhaQ9P8/AO2q+hiA1mBnV1vYpa8xHsJPrJvJQPnhjKp/6GIxtoVH1PjO+eBihZdIJ7q GEKoVkWqJgwFw+8FAxEE3nlQLt4+VRY= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf18.hostedemail.com: domain of mgorman@techsingularity.net designates 81.17.249.35 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673608390; a=rsa-sha256; cv=none; b=iwuVFhmimRSdiCeZLO41NVqoO/q3tme0TPCIKHM+ZEo/xoZRF96/4/WfjrvmlpB0soWbpD VOKgFjTNJ403iKrwP/3ypCOAehFrEW3MwEfHZwbD/1ORrGqrQjOaLxJxQkUff6Or12sPIs McFs2+beZ98ywk0zDi1PKoxWdabkSIA= Received: from mail.blacknight.com (pemlinmail02.blacknight.ie [81.17.254.11]) by outbound-smtp04.blacknight.com (Postfix) with ESMTPS id C6CB5D09FB for ; Fri, 13 Jan 2023 11:13:08 +0000 (GMT) Received: (qmail 10332 invoked from network); 13 Jan 2023 11:13:08 -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:13:08 -0000 From: Mel Gorman To: Andrew Morton Cc: Michal Hocko , NeilBrown , Thierry Reding , Matthew Wilcox , Vlastimil Babka , Linux-MM , LKML , Mel Gorman Subject: [PATCH 4/6] mm/page_alloc: Explicitly define what alloc flags deplete min reserves Date: Fri, 13 Jan 2023 11:12:15 +0000 Message-Id: <20230113111217.14134-5-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-Server: rspam07 X-Rspamd-Queue-Id: 2F5D61C000B X-Rspam-User: X-Stat-Signature: dc4jq83mykawp1rkwki5n56yhnh48odq X-HE-Tag: 1673608389-280344 X-HE-Meta: U2FsdGVkX1+uMfar9eqLBQqo9Qtcp3A9Wg7rGO/HqqgZh8BkDxrMqqzmwVyW1TnOFphsecQQKarInq51ugYSNmEPVljMC2JEJA8QHEsHfmK2+1uokvEqglQUsschYBl5vfwTxqOkqhmGz9sLfCedFjaD58rALmbL8iasvyzU5TZy+bi4XdM36MBn+HA+HnEcaXKt5FCX8U+YpykmBWA7ZU51h8OiwjuJtQR/jCfPinoQezkbf8LE4ofatNwocGyCB84L0FNwIdqGuOw/s0GvPCMGuAZdA3IADOUGp651i/yOdgZA+lOm7HvQNt2Mm2pN9IHE53yaT6v/yOtMzkXnHDKGoS1qv7JrOrNKkkQBFCs444Se5IB5vXS4IPUzGfv7bJ6ZBvHDP72cPSs9fBWKSOBJvoHt941nlOTh1pyIbCr0uFugDAxynTKDKl8ziugPHz22y1Ee1nWlyze/o+kVhgpmuJB/l3o0+u/WZK0rqVnh1PacEo8XWubu5L15RrU4ZB06TeFs1fDPaqbKBx2MLKaNclvAgPZTv7pdUykLxWz8KEdzyOQcPUtSglUS8zGDtjaaPtjBTuOQ3GVN3r6ilYdIEl4tWcrPFJ/Os4MnDx4v+wt3VUdJ2AKg3s6WuAmpkq4EED5NqJhb3zFs6pVK5CVW3vLtx5kcnhVmcsnKvodAbbn+8HIkDtSvxQv8OyEs2R835hFpxBTqc/fxhp7+uajLVB225+KQL/Ai+HSOpJeD+216nef/JSQ9bXbxU2O2TJsEI1rzU7yL/3Vcecaa6e0/Ypb0DJ17cT3JO5r7pQuXn0H/Wp0ADKN7/AsJPgQR0g4CAK0rH//8JHH31XMAZulQHaraXcA99BY7J7aUFVvftKqQfEnvZ3F4I3iPeTwr80iiDFG/U3rO1hcUv2gyS/ntA1GRj4DqAXNWPnr5fdLlEaaSZAvFsVfeMMJ+YVOQBSu4xxKzj4XbY4aHOEc HWSHs0gK BlYn40EuclNJrhX0vr8Npu0XZVravW/Vz8fDnRAqEDIOKkqdgF706vDQX1dpeXxQbVmxE 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: As there are more ALLOC_ flags that affect reserves, define what flags affect reserves and clarify the effect of each flag. Signed-off-by: Mel Gorman Acked-by: Vlastimil Babka Acked-by: Michal Hocko --- mm/internal.h | 3 +++ mm/page_alloc.c | 34 ++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 178484d9fd94..8706d46863df 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -749,6 +749,9 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, #define ALLOC_HIGHATOMIC 0x200 /* Allows access to MIGRATE_HIGHATOMIC */ #define ALLOC_KSWAPD 0x800 /* allow waking of kswapd, __GFP_KSWAPD_RECLAIM set */ +/* Flags that allow allocations below the min watermark. */ +#define ALLOC_RESERVES (ALLOC_HARDER|ALLOC_MIN_RESERVE|ALLOC_HIGHATOMIC|ALLOC_OOM) + enum ttu_flags; struct tlbflush_unmap_batch; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0ef4f3236a5a..6f41b84a97ac 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3949,15 +3949,14 @@ ALLOW_ERROR_INJECTION(should_fail_alloc_page, TRUE); static inline long __zone_watermark_unusable_free(struct zone *z, unsigned int order, unsigned int alloc_flags) { - const bool alloc_harder = (alloc_flags & (ALLOC_HARDER|ALLOC_OOM)); long unusable_free = (1 << order) - 1; /* - * If the caller does not have rights to ALLOC_HARDER then subtract - * the high-atomic reserves. This will over-estimate the size of the - * atomic reserve but it avoids a search. + * If the caller does not have rights to reserves below the min + * watermark then subtract the high-atomic reserves. This will + * over-estimate the size of the atomic reserve but it avoids a search. */ - if (likely(!alloc_harder)) + if (likely(!(alloc_flags & ALLOC_RESERVES))) unusable_free += z->nr_reserved_highatomic; #ifdef CONFIG_CMA @@ -3981,25 +3980,36 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, { long min = mark; int o; - const bool alloc_harder = (alloc_flags & (ALLOC_HARDER|ALLOC_OOM)); /* free_pages may go negative - that's OK */ free_pages -= __zone_watermark_unusable_free(z, order, alloc_flags); - if (alloc_flags & ALLOC_MIN_RESERVE) - min -= min / 2; + if (unlikely(alloc_flags & ALLOC_RESERVES)) { + /* + * __GFP_HIGH allows access to 50% of the min reserve as well + * as OOM. + */ + if (alloc_flags & ALLOC_MIN_RESERVE) + min -= min / 2; - if (unlikely(alloc_harder)) { /* - * OOM victims can try even harder than normal ALLOC_HARDER + * Non-blocking allocations can access some of the reserve + * with more access if also __GFP_HIGH. The reasoning is that + * a non-blocking caller may incur a more severe penalty + * if it cannot get memory quickly, particularly if it's + * also __GFP_HIGH. + */ + if (alloc_flags & ALLOC_HARDER) + min -= min / 4; + + /* + * OOM victims can try even harder than the normal reserve * users on the grounds that it's definitely going to be in * the exit path shortly and free memory. Any allocation it * makes during the free path will be small and short-lived. */ if (alloc_flags & ALLOC_OOM) min -= min / 2; - else - min -= min / 4; } /*