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 BFF0FC3ABD8 for ; Wed, 14 May 2025 23:43:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 144296B00D7; Wed, 14 May 2025 19:43:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0EF3F6B00D8; Wed, 14 May 2025 19:43:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E61F46B00D9; Wed, 14 May 2025 19:43:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C4A7F6B00D7 for ; Wed, 14 May 2025 19:43:23 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EEA9EE2AF8 for ; Wed, 14 May 2025 23:43:24 +0000 (UTC) X-FDA: 83443142328.13.724F6FB Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf05.hostedemail.com (Postfix) with ESMTP id 2D1EF100008 for ; Wed, 14 May 2025 23:43:22 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=hzDuKn70; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3mSolaAsKCMoqs0u71uE93ww44w1u.s421y3AD-220Bqs0.47w@flex--ackerleytng.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3mSolaAsKCMoqs0u71uE93ww44w1u.s421y3AD-220Bqs0.47w@flex--ackerleytng.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266203; a=rsa-sha256; cv=none; b=PPhP6jEhMsHs7UGLwFEZ+6x4/TU+nrg5FnqIbNc8wXHR2aiRa1L7bgU/94Ap3kW873EsxN t6V76y2ue58CbZiRORXg07skzw2Q8NtFiQeTXTm3jpiI++SnTe5BLGkaEJXRBZzWRq6nfR lWK4J1VTEkN45nQWphcO84iDLZYSK1U= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=hzDuKn70; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3mSolaAsKCMoqs0u71uE93ww44w1u.s421y3AD-220Bqs0.47w@flex--ackerleytng.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3mSolaAsKCMoqs0u71uE93ww44w1u.s421y3AD-220Bqs0.47w@flex--ackerleytng.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747266203; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jsmcesfFZlM8vI9EmxVXAuSJMymuSrAMKnT60ysxEi8=; b=1PKvL98jkV8rBxVh3hDpCOkoqjsthsE/TwX+N3O+watrXbElHAnCI8sbg86fWP136rpuVe ERahbJjeIRUdsUv36XBpwQzcf3pajVJNR3s0J5O4MATN92S5wtVPQjdcoT/S6Ke2F4CV3h Av+UG6RTy/l/xKU7fZNJHZDzn21pJ70= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-22fc0e42606so5135485ad.2 for ; Wed, 14 May 2025 16:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266202; x=1747871002; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=jsmcesfFZlM8vI9EmxVXAuSJMymuSrAMKnT60ysxEi8=; b=hzDuKn70BpcBfE+0oQPumK6gU05wLzSWKHTVUflaagYFoaN+b1T0R7X0p6WOk69Sht Xm9/pm7qJh0f/w40nuWUxEmXkW9TAxV+gbL/eOEt2vMNEZNgQ7YMUsR+uG66aDHDm/JD CD3+7zuViCPrxWPHsIfFtC9RkGZ7bMyvNAzdl9cTMzQksRilGmwKq/1/smqQtKZbfU5d IC/oqcVdY4qViosEjE5aFyVDkpZufD2Qit06bU1n5HRlB3iGxv8rS4rpXCoX89Y3iGSD q1xlMMJkvHHxMXjOAj5z80clgOvnOJ4Q9ougqdWN58n1qNCSDjE3UNscYlfCJvEnMT+0 W1gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266202; x=1747871002; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jsmcesfFZlM8vI9EmxVXAuSJMymuSrAMKnT60ysxEi8=; b=w9qdsTyrjO4WnCoG0fgIVkN4gadFDQW2J2QcW+/yDwVpsMAX/SgW4BgJ1pm/wIk4+r U/4Rvq7ciMUGY/V1omNh4CPGGkVW8T2mBfP+qCJS2F5AEK0DcYGOK0pNeQof6C6zidNA eDgR5tgXK6iJ5C425jik5W6punu6OzI1xV+S0+f2CJeRaiyczryE0Yy7nQZ7ETVbf7eX rQPwjpFmAaQlpwzCXXuurIyrMeUjFR+YfsCSQ3LOiJTkkoRL4XHebST9vE+qRzVVUozb pV5ftereu0+Z+RAhQL05NFsffYNmO8f88SnC5d2gyI2Hjqm3+V1jjrV3cLqOgXHgQfi0 rtBA== X-Forwarded-Encrypted: i=1; AJvYcCWIF+OKWu4tuEb5hpmzFh+GLVqPi1EsVu5O0jMnJxAPstH9e5l5mc5Ryj1DjADKMahIjnsVqSwObQ==@kvack.org X-Gm-Message-State: AOJu0Yydl7Va0c6zAhirAgHM073ueM2X5dwHRA+v4U9OiooColck+r+1 o0JA311+skiyBEK7Bt3W6ZaEygPWzrGGc3G/sTM8rClpAlbK8i2lr/NowFwyI3gvEm24ZAyODgh fo6BVvARWnr5tospWWQBEMQ== X-Google-Smtp-Source: AGHT+IF/P4aWlf9UdfQ/8YaI5I5tpZ8zq5xGXr4nPXfnbppEkqE1Ea4GA3jweli9KF4XtKTltUhzxoFBstS+BIdJOA== X-Received: from plbmb16.prod.google.com ([2002:a17:903:990:b0:223:4788:2e83]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:32c6:b0:22e:7c70:ed12 with SMTP id d9443c01a7336-231981521a7mr91558935ad.48.1747266201996; Wed, 14 May 2025 16:43:21 -0700 (PDT) Date: Wed, 14 May 2025 16:41:55 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <8548af334e01401a776aae37a0e9f30f9ffbba8c.1747264138.git.ackerleytng@google.com> Subject: [RFC PATCH v2 16/51] mm: hugetlb: Consolidate interpretation of gbl_chg within alloc_hugetlb_folio() From: Ackerley Tng To: kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-fsdevel@vger.kernel.org Cc: ackerleytng@google.com, aik@amd.com, ajones@ventanamicro.com, akpm@linux-foundation.org, amoorthy@google.com, anthony.yznaga@oracle.com, anup@brainfault.org, aou@eecs.berkeley.edu, bfoster@redhat.com, binbin.wu@linux.intel.com, brauner@kernel.org, catalin.marinas@arm.com, chao.p.peng@intel.com, chenhuacai@kernel.org, dave.hansen@intel.com, david@redhat.com, dmatlack@google.com, dwmw@amazon.co.uk, erdemaktas@google.com, fan.du@intel.com, fvdl@google.com, graf@amazon.com, haibo1.xu@intel.com, hch@infradead.org, hughd@google.com, ira.weiny@intel.com, isaku.yamahata@intel.com, jack@suse.cz, james.morse@arm.com, jarkko@kernel.org, jgg@ziepe.ca, jgowans@amazon.com, jhubbard@nvidia.com, jroedel@suse.de, jthoughton@google.com, jun.miao@intel.com, kai.huang@intel.com, keirf@google.com, kent.overstreet@linux.dev, kirill.shutemov@intel.com, liam.merwick@oracle.com, maciej.wieczor-retman@intel.com, mail@maciej.szmigiero.name, maz@kernel.org, mic@digikod.net, michael.roth@amd.com, mpe@ellerman.id.au, muchun.song@linux.dev, nikunj@amd.com, nsaenz@amazon.es, oliver.upton@linux.dev, palmer@dabbelt.com, pankaj.gupta@amd.com, paul.walmsley@sifive.com, pbonzini@redhat.com, pdurrant@amazon.co.uk, peterx@redhat.com, pgonda@google.com, pvorel@suse.cz, qperret@google.com, quic_cvanscha@quicinc.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, quic_svaddagi@quicinc.com, quic_tsoni@quicinc.com, richard.weiyang@gmail.com, rick.p.edgecombe@intel.com, rientjes@google.com, roypat@amazon.co.uk, rppt@kernel.org, seanjc@google.com, shuah@kernel.org, steven.price@arm.com, steven.sistare@oracle.com, suzuki.poulose@arm.com, tabba@google.com, thomas.lendacky@amd.com, usama.arif@bytedance.com, vannapurve@google.com, vbabka@suse.cz, viro@zeniv.linux.org.uk, vkuznets@redhat.com, wei.w.wang@intel.com, will@kernel.org, willy@infradead.org, xiaoyao.li@intel.com, yan.y.zhao@intel.com, yilun.xu@intel.com, yuzenghui@huawei.com, zhiquan1.li@intel.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 2D1EF100008 X-Stat-Signature: g4cfmxof7n8ad3q7i5yu9tzhjiucebq9 X-HE-Tag: 1747266202-369679 X-HE-Meta: U2FsdGVkX1++yr6NzirlrDe2Vt6cEqGPtMQnutZwBKc7D+tzjXtR8p2zhsM0Ga8cfdzHUtYIuDbTuHoyDldA2lenTj2VTw3m/lUiGECdLCZ4njfJ2EdcxKvKAc1smoZLsjmGZUs59Otr6SXCzCNRav3a+YPYDwykf0OIflD4UMF2HTvUXyw7M7vwtHUQajxgpFrGGv2WlUF77gqZDlLr/Acd/ZW8oTd13TUzm/rj7SdeY2NNcbJKOIyxb4Qxl/YWEuVnH03gv/rKLdZFGpP5MLn+2KsfkWnG+bqfxGisTiojA/0byahs2Dqah6ohkntH5p+drkHRoLTE0gDWp/4BSQAx/sxt6LVnel8vPOEBxDJjaJt41+F0iycWYb0JjDSnYdrHhwYAMbCFftrnNI/eMSYyO93A5FHY5On5tAgePi7j8kT0d/pG/R0lNxaZDslQxoTrx4Jwak+gFD2gzif/xF83XAl3vSW/V3l7QHfPB70RVHFJFHKqVcES+imIv+NOyYhz8nVO+GjhD3Ldeu7l486LJbTv+OJgK4wYyWx7TvDmXd4JrgtWokgTw3DNLdHZjZafQS8QUL+TC9Z5M4ZFz/hJ96VQmYhEtKT3+KBD5KUCsbTG40KbRDAM36aF5+yUkBfVWYYjhNmRlJGcLIhB7jX5W6V+XLsOb+uK2dHka8+gA+gbmJ2nQ2n6nYS/nf0njNPy4xadOzF+oXNFjS682Q7vu+rjg3oLVzjZpYA5dfCjdQX3e/7U/QxS7HhhgPMol/ZgI3eNfiSMKhMdOBN1nYVf7PD3kaIkfKiMuE2B/aU4ievDseMgvH+sZSTigvZy0p1ysxT8sJvlERmgeaEdnUEYUra/dzttZjqPtqhib5wJXBpkCygzB7gvcZmxZH0pFO36fssw3F8UmdF0NxyXcxknbKpNdkd6KjEtwy8DQPAaneQwlwN+JZUZ741BDPiRU9+cAYkfKHYJRYcAHrI OHGgFlO2 klRovEiKtHoRl7R5eh7Q+0as8kKoaFjveAN7ExlC1c5Q8hlTDDey/2mC0mxXVxcOIB8R+jUD7qIL+kKMH4chud+P2n4D2NtACFtsAtZ3GzqkDRWi8bRv4RrtswVu75EZkFqUr1Zj2VT8N3s8M9bw1dPdiU/rNzQNj1DkzWGTNvvFldRwyNDPUXQ/DtZkd5okAWhspjrkYqkavF0jhVNVKpsTKM2NZtVB/3p8MNJ3f+GCjoNTB6IOKKh0kO5y81sKl1alm5LUoJkIxMj60xJE7b/HpAbCcNmzSJV8MibJnr/CsFF23mp7dVyv73LKO4DAKG+jVy0N68Afv2iSoFvlAcHAy6PjPtAqmm0sBBeLXnPPDtu70WVGunBvyCrnAp7PUp93x3YZ8RjZJSP3TEg4c3y8kuEdtJ5ng8WZUgXZOUtTRDiA+En1u+Nu89AvNb9at7g660CDe1CqsmYamKgJEqvBeQxcf5JwpRGP9SR8kMIw64KaaQ3Kc0R+27n5ESyyxT+aOF6BlxVOCHWmjoNzn7QMWcgzOe2I0xjnuEYjirW8oP7kkseWBYfbVKZKfPlgtKpsWAEPT3QcfgXiHfg0fqTAg5cyPdSHOGTKejAs0BP4lV7SG/Re7BpWn1iVgjSNUKChLQ8LbmnydDUnGPeabsejq0RZBq7u9vPjDGKLVrSery0AZaN8tcKJBuQ9QXdUNpEKaCh8JwhJJY/Q= 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: Previously, gbl_chg was passed from alloc_hugetlb_folio() into dequeue_hugetlb_folio_vma(), leaking the concept of gbl_chg into dequeue_hugetlb_folio_vma(). This patch consolidates the interpretation of gbl_chg into alloc_hugetlb_folio(), also renaming dequeue_hugetlb_folio_vma() to dequeue_hugetlb_folio() so dequeue_hugetlb_folio() can just focus on dequeuing a folio. Change-Id: I31bf48af2400b6e13b44d03c8be22ce1a9092a9c Signed-off-by: Ackerley Tng --- mm/hugetlb.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6ea1be71aa42..b843e869496f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1364,9 +1364,9 @@ static unsigned long available_huge_pages(struct hstate *h) return h->free_huge_pages - h->resv_huge_pages; } -static struct folio *dequeue_hugetlb_folio_vma(struct hstate *h, - struct vm_area_struct *vma, - unsigned long address, long gbl_chg) +static struct folio *dequeue_hugetlb_folio(struct hstate *h, + struct vm_area_struct *vma, + unsigned long address) { struct folio *folio = NULL; struct mempolicy *mpol; @@ -1374,13 +1374,6 @@ static struct folio *dequeue_hugetlb_folio_vma(struct hstate *h, nodemask_t *nodemask; int nid; - /* - * gbl_chg==1 means the allocation requires a new page that was not - * reserved before. Making sure there's at least one free page. - */ - if (gbl_chg && !available_huge_pages(h)) - goto err; - gfp_mask = htlb_alloc_mask(h); nid = huge_node(vma, address, gfp_mask, &mpol, &nodemask); @@ -1398,9 +1391,6 @@ static struct folio *dequeue_hugetlb_folio_vma(struct hstate *h, mpol_cond_put(mpol); return folio; - -err: - return NULL; } /* @@ -3074,12 +3064,16 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, goto out_uncharge_cgroup_reservation; spin_lock_irq(&hugetlb_lock); + /* - * glb_chg is passed to indicate whether or not a page must be taken - * from the global free pool (global change). gbl_chg == 0 indicates - * a reservation exists for the allocation. + * gbl_chg == 0 indicates a reservation exists for the allocation - so + * try dequeuing a page. If there are available_huge_pages(), try using + * them! */ - folio = dequeue_hugetlb_folio_vma(h, vma, addr, gbl_chg); + folio = NULL; + if (!gbl_chg || available_huge_pages(h)) + folio = dequeue_hugetlb_folio(h, vma, addr); + if (!folio) { spin_unlock_irq(&hugetlb_lock); folio = alloc_buddy_hugetlb_folio_with_mpol(h, vma, addr); -- 2.49.0.1045.g170613ef41-goog