From patchwork Wed Aug 23 13:13:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 13362279 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 5AE14EE4993 for ; Wed, 23 Aug 2023 13:14:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D3CF8900022; Wed, 23 Aug 2023 09:14:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CEC738E0011; Wed, 23 Aug 2023 09:14:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDB74900022; Wed, 23 Aug 2023 09:14:18 -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 AEAC78E0011 for ; Wed, 23 Aug 2023 09:14:18 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7FA51120122 for ; Wed, 23 Aug 2023 13:14:18 +0000 (UTC) X-FDA: 81155412996.11.AC809D4 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf11.hostedemail.com (Postfix) with ESMTP id CEF714000C for ; Wed, 23 Aug 2023 13:14:16 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692796456; 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=sGHTBJfPfbpWrvSaUZpCtVi32GUYp0AP8xhZnfIvmvE=; b=LPidU3oxAj4D1I4eL3NoPpVLFMOE/1pz+CampWEmXgE0TantYEizjovcueoMX3SsTKC2wy CI7SJYuVlXLdOi6TAsABw8AfgENdUQRjRxfmbpkpRXSLBmx68m3YtfoFu+etEx3l6st2fL G/AFcu9senOdyoFoVztYRdbrABU0S5o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692796456; a=rsa-sha256; cv=none; b=ktInXFA3tm5C9xC+ye2YFSiU2RPZtyPEwSXQgXSOKgT0baNZrYlu1/l3lDADUKWht1ZzbI umtKpWrjAik2umT2rOZ4FO/dhEETiOm2kXsQ2WfHp6n+sCJ5iNG+RkL4LkjHm6VZkC1UAg C59QDvUzR/fSfpTavrQhs7e0IskLsPg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6E09E11FB; Wed, 23 Aug 2023 06:14:56 -0700 (PDT) Received: from e121798.cable.virginm.net (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2BD863F740; Wed, 23 Aug 2023 06:14:10 -0700 (PDT) From: Alexandru Elisei To: catalin.marinas@arm.com, will@kernel.org, oliver.upton@linux.dev, maz@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, arnd@arndb.de, akpm@linux-foundation.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, mhiramat@kernel.org, rppt@kernel.org, hughd@google.com Cc: pcc@google.com, steven.price@arm.com, anshuman.khandual@arm.com, vincenzo.frascino@arm.com, david@redhat.com, eugenis@google.com, kcc@google.com, hyesoo.yu@samsung.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH RFC 01/37] mm: page_alloc: Rename gfp_to_alloc_flags_cma -> gfp_to_alloc_flags_fast Date: Wed, 23 Aug 2023 14:13:14 +0100 Message-Id: <20230823131350.114942-2-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230823131350.114942-1-alexandru.elisei@arm.com> References: <20230823131350.114942-1-alexandru.elisei@arm.com> MIME-Version: 1.0 X-Stat-Signature: kt7d7j5mo6mwmea957pgw831jgkd535o X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: CEF714000C X-Rspam-User: X-HE-Tag: 1692796456-428294 X-HE-Meta: U2FsdGVkX1+cNXfI8CGwuL8fWKt+25QDpkgbgelLiIXR77EDYOEhbS95rKcEGDvEM9m1mzHoX0JGVXF6mWNC9FBgBZRrwXOSnJ+/VadmS/ErGkAWDsqkGLcom0KLj+8t2HgmmNIPR208TONmLrq5B1PNvhYNOgltpi27C5XUyeonyuWtdO7DjsVDrcFPMJ0pBGw1EWRPVojaPziz50TMKlky7yAV2A6cLhNJKmQJspY7Pw9d/JfSx7VFlI8bc9UMGEgIeAB7ELCUulLzj7qFeCGrj2wIdvCIJTW5Yn/oSHwBk+eKLOIBHcB0KyuEqOInlEXmYA5KT7MdzFACAxhzMh+ZHPLNKYGZNF3gdzf7UIiorK6wYU8yYj3YjEBJzWRQa/pR9Nu1++Q+nGQgvEK9RoYrmA3CHzugSV76qEjnaBGnWGvK5ypyG8C77tnWegKoG8NBFRO1lV44vcMprkhJZsmZO6XuPGOZKUZF6TNDuCqEFTmHbZwgUnV/McpwOZwhx4rdlJG54nNy0OlG6GhSgEEMEUeXe1nUNNcbHw5l/x1CCqUdeYWY3dv1covqBKzqyd3Rf3YMi+cEkHReXuq+VWxHFHqpM+0Ihb2xeRmFuBPnwX7yxoxVosD/aguKpQAhH/462l1tS8zau4/xtgjsS/12vKpxevMEG5bsPb8C18c0pnQ/T1lpWdqirqP+7z7lo50DFkb6CdIHQIa0U6rD07xMoMPuRD0udcHDUQObkdubwwCh+Iy8vZHcViq9wABYbRncuu5YQDcPDoX5Qm8ABD9yQtUkRzsH2rkeRSvpBcseCJIz/t+lLvECD3AyZQG5WpemCQ9blr4UomKhQl3dkiqfV1MFJKAgj4+0Cb/GJtB9+C6Q1oLlzwR6ibdaRMkW07/gjkAyD0lwX0skxZanlBYn/02FJSAU5XBhnpf9ANB6pQyfz4MV4Z8TYMDApAhDxNUHgtw+Sx5sNtrdO9K 6Uo7vzBD k94XFdWzmIEeB2RAmQmvTyPcd5HedL578XxDkfFJ1ycKnGtsaElCToRljSKs/hxqD8W5vh1PtXP4ileAYT85ESYfLX9QVxaTIgAJdO5gV/A88IqdNC4GuUm3gCnbkUF+okL+3+mxzQkS05ilJAXyY3M/8mdZeCFYq5ArdohxYRRYXqbR5OB5YjLwPFyFH2DpTVC1h17VCQFyxFSg= 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: gfp_to_alloc_flags_cma() is called on the fast path of the page allocator and all it does is set the ALLOC_CMA flag if all the conditions are met for the allocation to be satisfied from the MIGRATE_CMA list. Rename it to be more generic, as it will soon have to handle another another flag. Signed-off-by: Alexandru Elisei --- mm/page_alloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7d3460c7a480..e6f950c54494 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3081,7 +3081,7 @@ alloc_flags_nofragment(struct zone *zone, gfp_t gfp_mask) } /* Must be called after current_gfp_context() which can change gfp_mask */ -static inline unsigned int gfp_to_alloc_flags_cma(gfp_t gfp_mask, +static inline unsigned int gfp_to_alloc_flags_fast(gfp_t gfp_mask, unsigned int alloc_flags) { #ifdef CONFIG_CMA @@ -3784,7 +3784,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask, unsigned int order) } else if (unlikely(rt_task(current)) && in_task()) alloc_flags |= ALLOC_MIN_RESERVE; - alloc_flags = gfp_to_alloc_flags_cma(gfp_mask, alloc_flags); + alloc_flags = gfp_to_alloc_flags_fast(gfp_mask, alloc_flags); return alloc_flags; } @@ -4074,7 +4074,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, reserve_flags = __gfp_pfmemalloc_flags(gfp_mask); if (reserve_flags) - alloc_flags = gfp_to_alloc_flags_cma(gfp_mask, reserve_flags) | + alloc_flags = gfp_to_alloc_flags_fast(gfp_mask, reserve_flags) | (alloc_flags & ALLOC_KSWAPD); /* @@ -4250,7 +4250,7 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order, if (should_fail_alloc_page(gfp_mask, order)) return false; - *alloc_flags = gfp_to_alloc_flags_cma(gfp_mask, *alloc_flags); + *alloc_flags = gfp_to_alloc_flags_fast(gfp_mask, *alloc_flags); /* Dirty zone balancing only done in the fast path */ ac->spread_dirty_pages = (gfp_mask & __GFP_WRITE);