From patchwork Tue Feb 11 00:30:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 13968638 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 A0E86C02198 for ; Tue, 11 Feb 2025 00:31:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D38028000D; Mon, 10 Feb 2025 19:31:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3834F280008; Mon, 10 Feb 2025 19:31:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2245328000D; Mon, 10 Feb 2025 19:31:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0BBE0280008 for ; Mon, 10 Feb 2025 19:31:58 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C03631C7C12 for ; Tue, 11 Feb 2025 00:31:57 +0000 (UTC) X-FDA: 83105786274.11.469BFCC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 789C3C001D for ; Tue, 11 Feb 2025 00:31:54 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Fe6uQ0NQ; spf=pass (imf10.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739233914; 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:dkim-signature; bh=h0sopSeKMteOebrJDoWD56LIp+P2qMN45Do9CiZPN14=; b=Z7eQMRVMwMswG4EN0PpwuLbHu2Pibk+5Z9WaE86IcLUWdMcyhLW9DZIK+5YHd0ojXwPXcF OB/d+xtsDQdCXf96L4gc7IbA4kl5c9YFdI7LtWtIcS3cf+BFmGttYqHgZRYgWjacByCaUc h7HFCzlXrphjlXIeWSsl9WKYN61AD2g= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Fe6uQ0NQ; spf=pass (imf10.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739233914; a=rsa-sha256; cv=none; b=FRG9dQGBsWhyv7vB/SFDbvcxTssuNC8/reAz7QqKbqY8MS3MMzarj76KBNQomONqOcQoiC 7ed4zrUImLd9V0Q3KwnDMHU1+S6RKgGijiyK8sh9NdxV0+wCg2+3JlDUTX9nywL6Zb31Lj h1rc5b/llL4dAAEAMndfarB+k3QvO70= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739233913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h0sopSeKMteOebrJDoWD56LIp+P2qMN45Do9CiZPN14=; b=Fe6uQ0NQo7Z9YawQGvNLuga6jlclLK0hb+Ps392qs+P9eUCAxviPnKaZoF0H7MaTJbbdNz tD2Ct9uraFPPRSt1FUR3xac3mBTy8+2NLsnzR6bKmw08Ir2HeTOC8WnD+sK+x3DlWh12sc ZA2Z2fMv+oh3Ywx8QB6q9CUBV/Ponm8= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-480--IkTyaSUNSaX2JxRcwKqPA-1; Mon, 10 Feb 2025 19:31:50 -0500 X-MC-Unique: -IkTyaSUNSaX2JxRcwKqPA-1 X-Mimecast-MFC-AGG-ID: -IkTyaSUNSaX2JxRcwKqPA Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 236541800373; Tue, 11 Feb 2025 00:31:46 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.129]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C2B4718004A7; Tue, 11 Feb 2025 00:31:35 +0000 (UTC) From: Nico Pache To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org Cc: ryan.roberts@arm.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, jack@suse.cz, srivatsa@csail.mit.edu, haowenchao22@gmail.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ziy@nvidia.com, jglisse@google.com, surenb@google.com, vishal.moola@gmail.com, zokeefe@google.com, zhengqi.arch@bytedance.com, jhubbard@nvidia.com, 21cnbao@gmail.com, willy@infradead.org, kirill.shutemov@linux.intel.com, david@redhat.com, aarcange@redhat.com, raquini@redhat.com, dev.jain@arm.com, sunnanyong@huawei.com, usamaarif642@gmail.com, audra@redhat.com, akpm@linux-foundation.org, rostedt@goodmis.org, mathieu.desnoyers@efficios.com, tiwai@suse.de Subject: [RFC v2 4/9] khugepaged: generalize alloc_charge_folio for mTHP support Date: Mon, 10 Feb 2025 17:30:23 -0700 Message-ID: <20250211003028.213461-5-npache@redhat.com> In-Reply-To: <20250211003028.213461-1-npache@redhat.com> References: <20250211003028.213461-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspam-User: X-Rspamd-Queue-Id: 789C3C001D X-Stat-Signature: taybcojpu6bi9emp36xo1rxp8ogyte9t X-Rspamd-Server: rspam03 X-HE-Tag: 1739233914-330809 X-HE-Meta: U2FsdGVkX1+1A1hgXQLXKV16UKsqXtykAbblenSwfNWq1t1a4QYhnzIvcRLG0V1s/YyHFVxdjOAjMpSeJlgk3ZLy90Si7C5WlQc83JRqWfURXj9qWqlh1qupHs2PnhCEg+DILw0w66ejgi0AxeztybtDpkkLIzVdVm0FLQenuC92oN0cGdarmgET5dGY4seQ+ddsX+7Aeo+JvMLyDnVJugghCvgnTvR7AV2ays/U7ZlsWBtGcQcVsRQpDH8x4lzFP4/OYRfN7tOpYUWpnMj9847ucHu9ai0sLEyuTGfX74hOE10OOy23T8aO55jHJueWHnzxtUOVKTlMNxzr4LVuybqXo5w7QgjjNBbDE+950uDAwYMnoZszEjtD94VRkzf9or+02UU7azXD/+Lhm0ehjTaaMCPE4mXkl8MkbCx0UIIh1LVrrpFj8Y6gQrz3wJ0gvXiPD2ANbKN7WyYeFPcxpNu3FiuXBvk76Ob9geQQM0/QOok0YbxDhNbGmVTY6YvSXU+m78XN47lDYTOWsxPcLBqyMJ1N36D+70DEidCws5heZPQilTsALdVhrsFrYDldJOqUJfUz/QkyPMsYxnMusd/YOMuSVycXZ1Jb3An4uYUuQlru4cSmYJaoGO2X4+znrNWdDkyg66E7l7jMzrvppFVYMsQrIH2/QtS06O2vKv6GlO6E2cGMx7NsToSvGqj6+1e0QDHRlZq7vrttFIRnFDTvJzk4SLND3NibQz9ZNB4t0p2NvhmFXu/5wzf/kJbFGtHUmcaIDtKMB9Jv/dsuEYgQ6jfvkjn+E0OTV6T1FOhYxhIApnQ/Pzr02nLwoukPrKh8esO5MxljyZo8A20NJbunpv9mQ8Xhwf0I9Gp5g++9KmepXhcsoSdUAL2Fy2KGplXo7sVqHoGLh3CBoYqHu7pO5nX0y2rwVr8bTjX6ns/qAm4Ydm1Q6KWfGHeikQm3ov3g3jkTKNJDtJXgJmn VkRci+1a VmFJNesdXfbzNOO/v+pZPA1+DidYPSNBEHx197sq6NFhMeg+hByujApiXGFhpsYXCjsG40hKEfI+kdueIFeK7H6DVY8N0G3AqlfWD0zRzSXSFmbZtvTqgnJNX3rPQ4cSDbsBcOx7xPNMPaHBRhJa8Mnl11e51F9jVaQEmmMFBKOP5o4tRB9M+/8KLf/ZAkqnzs+ZquFU/Bv5boSsT68eArLMIJfjLOAuBk8ei7+sD4Hy1gcse755RmrbntLWPwUPGbnE/K9h6yo92z7cLvkOJmFma74OeABiCHqyunfU2cNkywHo8d/kyTd/LAbgyhiUYf3j7PSHVD5VTQO2y2oyYqDNXz0Sl3/KDAUluKcm6AjRfVhGqKQYrxz0RtkLTB4JJZ+eNlUCbtomdiC8mhhcUm9JzSPu2RY4Bt7zpeamElZJ3iigBU4oYmmwQwgIbz8robkvb 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: alloc_charge_folio allocates the new folio for the khugepaged collapse. Generalize the order of the folio allocations to support future mTHP collapsing. No functional changes in this patch. Signed-off-by: Nico Pache --- mm/khugepaged.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index c834ea842847..0cfcdc11cabd 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1074,14 +1074,14 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm, } static int alloc_charge_folio(struct folio **foliop, struct mm_struct *mm, - struct collapse_control *cc) + struct collapse_control *cc, int order) { gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() : GFP_TRANSHUGE); int node = khugepaged_find_target_node(cc); struct folio *folio; - folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, &cc->alloc_nmask); + folio = __folio_alloc(gfp, order, node, &cc->alloc_nmask); if (!folio) { *foliop = NULL; count_vm_event(THP_COLLAPSE_ALLOC_FAILED); @@ -1125,7 +1125,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, */ mmap_read_unlock(mm); - result = alloc_charge_folio(&folio, mm, cc); + result = alloc_charge_folio(&folio, mm, cc, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) goto out_nolock; @@ -1851,7 +1851,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, VM_BUG_ON(!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && !is_shmem); VM_BUG_ON(start & (HPAGE_PMD_NR - 1)); - result = alloc_charge_folio(&new_folio, mm, cc); + result = alloc_charge_folio(&new_folio, mm, cc, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) goto out;