From mboxrd@z Thu Jan 1 00:00:00 1970 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 78C48C4332F for ; Thu, 8 Dec 2022 18:07:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1AF728E000B; Thu, 8 Dec 2022 13:07:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 15F918E0001; Thu, 8 Dec 2022 13:07:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 027728E000B; Thu, 8 Dec 2022 13:07:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E6B518E0001 for ; Thu, 8 Dec 2022 13:07:11 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A238EC056C for ; Thu, 8 Dec 2022 18:07:11 +0000 (UTC) X-FDA: 80219920662.20.323E9B3 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf28.hostedemail.com (Postfix) with ESMTP id BD74CC0002 for ; Thu, 8 Dec 2022 18:07:08 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=fSbt6kLY; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=cd4pX7ea; spf=pass (imf28.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670522829; a=rsa-sha256; cv=none; b=dGF19XL1ckVHDr/riZYKvZ3MYIK4FTMPEKUcJh0JyAIYPCAJJTt1Jwvp5qzVCzRuSpdo+w E8RdmerEgBzQiHiiLPu767a8QMj8wmbKXr4lSLEoMALqh8aRUxfNburdAlxuSXGih+4oAK FhK7qZHGBxl9B/70pj3Ljah+TaxpAcc= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=fSbt6kLY; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=cd4pX7ea; spf=pass (imf28.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670522829; 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:dkim-signature; bh=2IVFdreTiW3Ao76M0ZnFXsibpRuEnW0G9TNOeobmX04=; b=2C0fPckV231+ER5PqbPjQdwjjo/rcEv4ctzCl31CLONfVs3L5qowvifL9XqhtjQYRK8OLh ucAi/LpkqQt6dcVu8W5a8A/Pekb7V26J8EPHoCQoheg3rdknt7ij8F1j7EJT9gJzIduPFh PhHXvu6JsRBdYn08icJRgnxy0CdGdvw= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2C9F6337BE; Thu, 8 Dec 2022 18:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1670522827; h=from:from:reply-to: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=2IVFdreTiW3Ao76M0ZnFXsibpRuEnW0G9TNOeobmX04=; b=fSbt6kLY63AOz+vIZuy4QK+CplJnBNxZh4n9ub+MlrIRjqChSxJ9Uo9q7oB/1CB4V7OOVX rBDWYpzRc03wJBWUUxFyBUitjmI5/fRNP3CY7k2byohmqKLG3OVw1IthirZQGjOekOm4v3 jSOG6pJDIugFm3FH9bb6IHIZrbEisjU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1670522827; h=from:from:reply-to: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=2IVFdreTiW3Ao76M0ZnFXsibpRuEnW0G9TNOeobmX04=; b=cd4pX7eaU2waBv+JzMDNpQDtWsG6lwe1eWMZTu58/TxXMwzz+avDzSAa/oAhgFnNo+HC4b WMjc+MHj0tFmOQBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0524E138E0; Thu, 8 Dec 2022 18:07:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id e6AzAMsnkmP/UQAAMHmgww (envelope-from ); Thu, 08 Dec 2022 18:07:07 +0000 Message-ID: Date: Thu, 8 Dec 2022 19:07:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: Re: [PATCH 5/6] mm/page_alloc: Give GFP_ATOMIC and non-blocking allocations access to reserves Content-Language: en-US To: Mel Gorman , Linux-MM Cc: Andrew Morton , Michal Hocko , NeilBrown , Thierry Reding , Matthew Wilcox , LKML References: <20221129151701.23261-1-mgorman@techsingularity.net> <20221129151701.23261-6-mgorman@techsingularity.net> From: Vlastimil Babka In-Reply-To: <20221129151701.23261-6-mgorman@techsingularity.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: BD74CC0002 X-Rspamd-Server: rspam01 X-Stat-Signature: hyt53eybw57h9kci3pspzshkxkestj5m X-HE-Tag: 1670522828-904794 X-HE-Meta: U2FsdGVkX1+nSbRbqgs9+0nlvYHN+IfksKtm1QwPNDHNgfzBaVajaV6WuSC6G3FlhEoNq8F7m9veT9z/NDT36ViuhXL1R5Bb30/AwygHHhJ6B5ZgB9R3Zz5O/FouLWXaSHVtN2EgfzWM70iFybabXyqR3zjHYM2AuRcVLGHEuY6remYQUGoBZr1QVaM/0qh73Fm+jLr9iuMM1xJPh2hXbXbthLgcFLBZ5yEJ/ssLSuzWqWSzw72lAbRDGENGTuPz7GfCsqJ6TI8xsVSs8pcw/eSSmPvPvRQOCNCJVGDQZ7WSZ7v8uSPcEGtPC1Y1ZW4G/Ocon1nfCB7vP9qAQciIEM2Wl3tbN+lkK7J4tRo17SPnv2YRAinr92/iVwrmO4FL5BvpYMZ/8FN2uzqHlGhR1RtE26rZ8/Le8ctmJfcs+EB9UNRZNSnH6wkmkvhteGkKNaxWw2LBmwF07nl6cgFlPTigipdwQjokTtLThim5/jqSsroxim37DteZMp4Bxpg86qtI2uVQLYHrCqvj6QgKc69+0JXwZWVzZdlZRWqozkHFC4lCAD9npOYbBMOUiUnUHW+FdKn7rTkk1BBmmsrFAzYMyGXgStPqJZtMDg4AviV8khjvdgaBpgHQJe+DkaaJgT11CSBm6egOlu13X+ui1iAgeETkRBnLdxzvX+O5X3wlFBXKlZ0eKFB3HAZ18DGFCEiW6K0wIageeedesTmoBxl7fgCUVXQAYmdLMUu1UAX5XPC4aAmLiMbv2XZjrb6TPaAkcuQlTOaKMHLuYfFVD9Si2nUMJRbfTxtNw19FsMpDuxoc7scD7rI3JTAX5a0w9BDeZ9JGmggA+2FZ1J6cHRhMkWaYZaL30EvAIM2jk4pmWh8UuMqx++OZOArPLvFDeFxPdbTgfxXX4qo+6Xt5P4tVij0gTDS/qKin6I4aTWuS5uUISST206LUkLbJNqKhl3pDE/DjHcHiV/bKq7w mCmDzhi5 yixZJoFFQpqU/nYZGcQlRL0wfmfVrVWN+SNuSHgQ+lOGsMxEw4lYxS0FQoA== 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: On 11/29/22 16:17, Mel Gorman wrote: > Explicit GFP_ATOMIC allocations get flagged ALLOC_HARDER which is a bit > vague. In preparation for removing __GFP_ATOMIC, give GFP_ATOMIC and > other non-blocking allocation requests equal access to reserve. Rename > ALLOC_HARDER to ALLOC_NON_BLOCK to make it more clear what the flag > means. > > Signed-off-by: Mel Gorman > --- > mm/internal.h | 7 +++++-- > mm/page_alloc.c | 23 +++++++++++++---------- > 2 files changed, 18 insertions(+), 12 deletions(-) > > diff --git a/mm/internal.h b/mm/internal.h > index 370500718732..98b1e526559d 100644 > --- a/mm/internal.h > +++ b/mm/internal.h > @@ -743,7 +743,10 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, > #define ALLOC_OOM ALLOC_NO_WATERMARKS > #endif > > -#define ALLOC_HARDER 0x10 /* try to alloc harder */ > +#define ALLOC_NON_BLOCK 0x10 /* Caller cannot block. Allow access > + * to 25% of the min watermark or > + * 62.5% if __GFP_HIGH is set. > + */ > #define ALLOC_MIN_RESERVE 0x20 /* __GFP_HIGH set. Allow access to 50% > * of the min watermark. > */ > @@ -758,7 +761,7 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, > #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) > +#define ALLOC_RESERVES (ALLOC_NON_BLOCK|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 85a87d0ac57a..6bee987ec9a3 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -3994,7 +3994,7 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, > * if it cannot get memory quickly, particularly if it's > * also __GFP_HIGH. > */ > - if (alloc_flags & (ALLOC_HARDER|ALLOC_HIGHATOMIC)) > + if (alloc_flags & (ALLOC_NON_BLOCK|ALLOC_HIGHATOMIC)) > min -= min / 4; > > /* > @@ -4846,28 +4846,30 @@ gfp_to_alloc_flags(gfp_t gfp_mask, unsigned int order) > * The caller may dip into page reserves a bit more if the caller > * cannot run direct reclaim, or if the caller has realtime scheduling > * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will > - * set both ALLOC_HARDER (__GFP_ATOMIC) and ALLOC_MIN_RESERVE(__GFP_HIGH). > + * set both ALLOC_NON_BLOCK and ALLOC_MIN_RESERVE(__GFP_HIGH). > */ > alloc_flags |= (__force int) > (gfp_mask & (__GFP_HIGH | __GFP_KSWAPD_RECLAIM)); > > - if (gfp_mask & __GFP_ATOMIC) { > + if (!(gfp_mask & __GFP_RECLAIM)) { This is supposed to be __GFP_DIRECT_RECLAIM right? Otherwise that includes also __GFP_KSWAPD_RECLAIM and GFP_ATOMIC sets that one... > /* > * Not worth trying to allocate harder for __GFP_NOMEMALLOC even > * if it can't schedule. > */ > if (!(gfp_mask & __GFP_NOMEMALLOC)) { > - alloc_flags |= ALLOC_HARDER; > + alloc_flags |= ALLOC_NON_BLOCK; > > if (order > 0) > alloc_flags |= ALLOC_HIGHATOMIC; > } > > /* > - * Ignore cpuset mems for GFP_ATOMIC rather than fail, see the > - * comment for __cpuset_node_allowed(). > + * Ignore cpuset mems for non-blocking __GFP_HIGH (probably > + * GFP_ATOMIC) rather than fail, see the comment for > + * __cpuset_node_allowed(). > */ > - alloc_flags &= ~ALLOC_CPUSET; > + if (alloc_flags & ALLOC_MIN_RESERVE) > + alloc_flags &= ~ALLOC_CPUSET; > } else if (unlikely(rt_task(current)) && in_task()) > alloc_flags |= ALLOC_MIN_RESERVE; > > @@ -5299,11 +5301,12 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, > > /* > * Help non-failing allocations by giving them access to memory > - * reserves but do not use ALLOC_NO_WATERMARKS because this > + * reserves normally used for high priority non-blocking > + * allocations but do not use ALLOC_NO_WATERMARKS because this > * could deplete whole memory reserves which would just make > - * the situation worse > + * the situation worse. > */ > - page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_MIN_RESERVE|ALLOC_HARDER, ac); > + page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_MIN_RESERVE|ALLOC_NON_BLOCK, ac); > if (page) > goto got_pg; >