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 E105FC47DA2 for ; Tue, 16 Jan 2024 14:36:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 636206B0080; Tue, 16 Jan 2024 09:36:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E6F76B0082; Tue, 16 Jan 2024 09:36:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D60D6B0083; Tue, 16 Jan 2024 09:36:04 -0500 (EST) 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 3E74F6B0080 for ; Tue, 16 Jan 2024 09:36:04 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C307BC097C for ; Tue, 16 Jan 2024 14:36:03 +0000 (UTC) X-FDA: 81685423806.13.A6DE596 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf13.hostedemail.com (Postfix) with ESMTP id ADC1F2002E for ; Tue, 16 Jan 2024 14:36:00 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@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=1705415761; 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=5rjR6Ui1Q35zUHIE+ZiUmgR7yjzTHlpUajeZeWCZuTo=; b=iXSX5atgl0YUrfMaXWQSrXw93/Z5ot8rJM0JELJiWLa3XYXwGc1hxWJI72yRGGYJBDFwAJ J1nnODS2GGRpSaB7W5qfjOY0iOM4ukIEmlzqqWWEOF23zV+Wjpl+aBAWkjAI26VAIdcMLC Qd3MMvDmlubr9ryHsC7QcYoFGaM57ig= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705415761; a=rsa-sha256; cv=none; b=MXBnuIlrWi4dN1tNtSE3m1zgRFHmrod1eOpDF9U5fr8zb0YKcZkALSKhzhX8KUsJYQ1dHg bgPj3CeHitMXDJc1FDRgGmjHwa9vgmzTiAt/H4ko/7nbXLUIKQx4WC5Sv6q/rsCxVA1fQ3 98eH3qJsofiqJBjMTMfW9FuxnG6mePM= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@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 4000B2F4; Tue, 16 Jan 2024 06:36:45 -0800 (PST) Received: from [10.1.38.190] (XHFQ2J9959.cambridge.arm.com [10.1.38.190]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5B2A23F5A1; Tue, 16 Jan 2024 06:35:57 -0800 (PST) Message-ID: <2c24afdf-5103-4c1b-a649-2eeed185f3fb@arm.com> Date: Tue, 16 Jan 2024 14:35:54 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm: memory: move mem_cgroup_charge() into alloc_anon_folio() Content-Language: en-GB To: Kefeng Wang , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox , David Hildenbrand References: <20240116071302.2282230-1-wangkefeng.wang@huawei.com> From: Ryan Roberts In-Reply-To: <20240116071302.2282230-1-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: dkrti5o9nw7rgmnht5e5ntkzrntu878d X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: ADC1F2002E X-Rspam-User: X-HE-Tag: 1705415760-803660 X-HE-Meta: U2FsdGVkX1+Lt1+fr5Uj+bGWRJUjQLZi+Se1SGRvTiFJiSc80xzYie69uj79DtvsWhIwrqS5sKENfPlcBSJwxgWc2FGzq811bxe61WBZRHg6zED8mis6dRbiNPdfEBqk1JP1vaMsSxvpgpsaOOS973tQi3Nv5rpmyQdycKpXpCx02aS98CO0c7GuJUkEQbx00WhgqyWN+e6t+CaC9ysuDDQZUWVLS2xN4ehzSz34dxwUPczhnyJ2Gk6/CuZBkyIR8Okp67qwmwN8sgDYa53Kr0ayZLyOuARksU11E/BiM9mJNTo3nB4DR7Bz9EY0LfqqQl/eGx885MtQcpDqpFs/KRawN4RgPRHZea/LKPiq0le6dqKqvfP3Y3t9xSBuE/taSrWtcP+Mca3oxZcm8krpBCbE64HdVKdI5UXEPuRpxzHwLfZI2kBVfdCdHZ6WK2mvZkwphrRseIzGrXEz66vjgTi3sPG8dmu6aR0WChdUT1UTqCSxkLwOX3PwkAIAzQkiCM9riFaaP9QNNZ0ukFIrOYEOnVrZW6m1cO9MDiXEmpGwtFcQhwj6/E92kOWE+sFwJzTPfSXQOZ+oJCKyjKB5geH5Q7GI0HF7YkTRYCQMYGcQRBMTzjMhVQDB8BVQq4U70sfoYHgv/KZYcWYkaPu3MyeMgtCNzpT5h/fVONN7yDxPlJVP/1J7DP+PanoTKkUCobJ4Z7QwN3NkjiEvmt1ewn7ais3EBdlnNFVi0Ioleiftd1MhYUfVLutqewukyJen4LbxsX57FN0tl0Uqx94eluN0/UCCTZQPqftACQw24v7FbpUqrNW0FEHfk8HYRxN+suYCre1nXU7paWpnIncg1V8y/Q5KZ4LrcY0rya7DVVe0+sT+MQvLja/uUpnpoYGnMabS+16HY6urMM+b9jZePE/8bUIM7zNB3egV56HebP0YpuTNJI6tJbcPjXnwo4LFy/4UStC93wU0kdHXhXD LXcDp7nD 7YUwxnqtIz8iZFQlJ3X9n1JymgXyOiNWA14aUZeD9VQpgFHM1scdYcuCUwJraO45TQHixdPvi5xjwFbUxw6LJGzzXBOLeedCdM4Z0DpP9SYTjCCo5nhzVfxDoSa9e+FZfN72EpOK9+TlBOrEBZrP+RdDPagGnKPrDJxnZRWKdMEU7vjUcDTZAVqbcOi28URmgDYvXd1Zam49Xbi6qDoOvzx/rXQ== 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: List-Subscribe: List-Unsubscribe: On 16/01/2024 07:13, Kefeng Wang wrote: > In order to allocate as much as possible of large folio, move > the mem charge into alloc_anon_folio() and try the next order > if mem_cgroup_charge() fails, also we change the GFP_KERNEL > to gfp to be consistent with PMD THP. I agree that changing gfp gives you consistency. But it's not entirely clear to me why THP should use one set of flags for this case, and since pages another. Why does this difference exist? Otherwise, LGTM! > > Signed-off-by: Kefeng Wang > --- > mm/memory.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 5e88d5379127..2e31a407e6f9 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4206,15 +4206,21 @@ static struct folio *alloc_anon_folio(struct vm_fault *vmf) > addr = ALIGN_DOWN(vmf->address, PAGE_SIZE << order); > folio = vma_alloc_folio(gfp, order, vma, addr, true); > if (folio) { > + if (mem_cgroup_charge(folio, vma->vm_mm, gfp)) { > + folio_put(folio); > + goto next; > + } > + folio_throttle_swaprate(folio, gfp); > clear_huge_page(&folio->page, vmf->address, 1 << order); > return folio; > } > +next: > order = next_order(&orders, order); > } > > fallback: > #endif > - return vma_alloc_zeroed_movable_folio(vmf->vma, vmf->address); > + return folio_prealloc(vma->vm_mm, vma, vmf->address, true); > } > > /* > @@ -4281,10 +4287,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) > nr_pages = folio_nr_pages(folio); > addr = ALIGN_DOWN(vmf->address, nr_pages * PAGE_SIZE); > > - if (mem_cgroup_charge(folio, vma->vm_mm, GFP_KERNEL)) > - goto oom_free_page; > - folio_throttle_swaprate(folio, GFP_KERNEL); > - > /* > * The memory barrier inside __folio_mark_uptodate makes sure that > * preceding stores to the page contents become visible before > @@ -4338,8 +4340,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) > release: > folio_put(folio); > goto unlock; > -oom_free_page: > - folio_put(folio); > oom: > return VM_FAULT_OOM; > }