From nobody Mon Jun 8 16:29:07 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4705438AC8B for ; Wed, 27 May 2026 22:49:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779922158; cv=none; b=J4CMcAnrvALPprpPVRzGnzt4PLwX6LGfwY9qol+xWVCd9iPG6eSCAvOqB6kQhlOASD0ScXHjuYV19u9C4FufJQtArJQyor/w8T+fMqGT/gzlGH1lUqkta7/sK78kYBXCuKwtpf3NL2U1zw3JiD9We+8GkbCR8WevS1og7oUNNf4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779922158; c=relaxed/simple; bh=M7qb9kV2C4IUPNXZvBgkRDjSeCa+xYLeb7uEtThDMNg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=M+pF0jcmb9RCXYwHtAhbl1fiD0QCkcCieJzQXJZy41anT27T0dXhD5ab41cQfrGWkq8RWx5jbN37igaP48U6xwEP8F0cIqtrJk41xcHvpEMDC7UWnSJVWGel6Fy26vG2tTo4wqmxNJsaJxgjipFlwiZHqmZVFjwmmh21eg0yxOI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=hB9eDVzL; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=ePV4tFYH; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hB9eDVzL"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="ePV4tFYH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779922155; 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; bh=bwNypzZtj0CYSMM6tcncQY6OAS/9PwcMNtbHXNOoRus=; b=hB9eDVzLU0hdFVaRKRJrG89k5AD9KmDpnhDOmgR5OOfkiwXUUBwAXYjR6lK3h/MMh9IU5C PZdm6XOrxv4Bi9wAabpLJ31hezJCjxt7ZnuMM2cGEOeiM67E/f1XMOO/6qs1d9U8tPrGDI y7PqOoCjmqv5uHNBmg7O+DpoXW5HqpQ= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-6EtlDHeJNvWiA6vIXkmO_w-1; Wed, 27 May 2026 18:49:13 -0400 X-MC-Unique: 6EtlDHeJNvWiA6vIXkmO_w-1 X-Mimecast-MFC-AGG-ID: 6EtlDHeJNvWiA6vIXkmO_w_1779922153 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-516d6cf547bso125068341cf.3 for ; Wed, 27 May 2026 15:49:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779922153; x=1780526953; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bwNypzZtj0CYSMM6tcncQY6OAS/9PwcMNtbHXNOoRus=; b=ePV4tFYH48wENOmGLXlMvmeFYtv+jWJV7eqqkVfx4op8W4hYwCgHysEh44Q8hq0w4g XCASXBtFpc/OzlXnaMGVXlL8nRfdWdWCI7eyIpDAfi3pBPR5nl6UvZAl+wuOenm6uFvC neBjkYMFZVXRMs1CQCDBgQ+bflKiy9hZ60hKOBaPnX4/vXtT9XrFiT6V/sEdesEwFlVZ 2yLQi/5Qm+gDA9yo2EDLwzi2t1oq42OLqSWjEbjdZlGPZKLyE+49xzVVKD73JLkguvIJ 4ShpL8KJAbio50bDBKH5u+7jDOXxp2YNqNIVtCM8rR5FQPrV4VPbtJlAvdBZOnKFIlPm UNEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779922153; x=1780526953; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bwNypzZtj0CYSMM6tcncQY6OAS/9PwcMNtbHXNOoRus=; b=OGvjlLrolMW/QeLU4xvtAZBSFxdPWLzny5v5D2BC1JdXFauyQbnfI5oB/E2dakKOmg 7eiad6E7uYNQ5yPTZJfTpy7sJgr0oXvrxCe12tLJdlCS7WNpz/aFuj2N4V4l0LFoGUyD RcTZvFYn4n/3gc/zS0Ssep/vQiqqQahxU/E2vNJxe3zhlPRg5XiS8n3/e+o17rpPmgGS BPvjkyK+EfmBUgyqaxEHtgHM6zodDn3QsQEQyAKmlyDmwwJ4quFDNrDkG8HgPxF6XCEb sQ25enukQefnpCYVYiPkL60AZXd81SRdFeoHJn0DjoZ5k1ztf2KN+iDyLE+0Yn6QaQzL x0IQ== X-Forwarded-Encrypted: i=1; AFNElJ9mMQ4+/RQUd/B/1HZVdyaJrsbte2B3SocyY00dHox5zS74BtTPCVimrYAub7B1qKPBIbZrW5huB/SSZP0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+6ZCJ9/RWiwhtSpecfmcR5gbp+jkLYs/3YyWm6Aq+RhWufwDd iYE6kVDSkz3pM2MtqIXBaBsXeSykCP//2KAClhRYrgp+m78zhFF84KwCvkFhqJiaprwWSD6art4 iHYVJyPEcV9+jIbiys59b7apl2VKKSQDSzE32VfVtIsEYPHS6P+j9fYJyYEm9ArDdwQ== X-Gm-Gg: Acq92OGX9Io9Bpvp08DHHVoZ9i2NCQElXYtJxAQGyyRjiwLca+M7gZUhvbUeqg6bEfd SODI1syoVAlkcQZxwKbdqYN9v+LVOH1VXhVV/zXljk2rFfvt9IKKmrKZD9020tpkPJpu6Yr5/L6 6e5hbME8jIQC+39hD9/IREmh4VOU5De0PaJPUGwyE1tmvTCSpewCpn1BEJ4OoelRRu9zUK1i5DP GdfDUzZqX9u+w7J9u1FNvfMARUn+pUDjKRIZH0mH+4U4fTkihZFBJ12MwiQBea4kgiIVREfhoH9 TXlIujoTsHItBYfnTJexntG5RiZgZmV4tDph18AtetYGFoclZHHghTWpvq2uPjAn6cM8uRekXr/ Te/f3KUNpFbjO2bmyFK881R6yd8NMvNEPkmUrkPNMD5WzEtfa48AT7aawGjBpLXpq0FImKITerG Y+uNDbCTn4Ak8iLAV1AmCYmA== X-Received: by 2002:ac8:7e91:0:b0:50d:597e:4b50 with SMTP id d75a77b69052e-516d42e07a9mr373458681cf.13.1779922153282; Wed, 27 May 2026 15:49:13 -0700 (PDT) X-Received: by 2002:ac8:7e91:0:b0:50d:597e:4b50 with SMTP id d75a77b69052e-516d42e07a9mr373458301cf.13.1779922152814; Wed, 27 May 2026 15:49:12 -0700 (PDT) Received: from chaithco-thinkpadp16vgen1.redhat.corp (174-16-146-173.hlrn.qwest.net. [174.16.146.173]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cc80dcec8esm181079486d6.7.2026.05.27.15.49.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 15:49:12 -0700 (PDT) From: Charles Haithcock To: muchun.song@linux.dev, osalvador@suse.de, akpm@linux-foundation.org Cc: Charles Haithcock , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] Respect mempolicy when calculating surplus huge pages. Date: Wed, 27 May 2026 16:48:46 -0600 Message-ID: <20260527224848.1753560-1-chaithco@redhat.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Presently, when calculating how many huge pages are needed when reserving surplus huge pages, the global count of free huge pages are used. When reserving with a mempolicy, the global count of free huge pages is used even if some/all of those free huge pages are on numa nodes outside of the mempolicy. Fix it so free huge pages only on nodes within the mempolicy are considered. Signed-off-by: Charles Haithcock --- mm/hugetlb.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f24bf49be0..02752ce735 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2255,6 +2255,23 @@ static nodemask_t *policy_mbind_nodemask(gfp_t gfp) return NULL; } =20 +static unsigned int allowed_mems_nr(struct hstate *h) +{ + int node; + unsigned int nr =3D 0; + nodemask_t *mbind_nodemask; + unsigned int *array =3D h->free_huge_pages_node; + gfp_t gfp_mask =3D htlb_alloc_mask(h); + + mbind_nodemask =3D policy_mbind_nodemask(gfp_mask); + for_each_node_mask(node, cpuset_current_mems_allowed) { + if (!mbind_nodemask || node_isset(node, *mbind_nodemask)) + nr +=3D array[node]; + } + + return nr; +} + /* * Increase the hugetlb pool such that it can accommodate a reservation * of size 'delta'. @@ -2277,7 +2294,7 @@ static int gather_surplus_pages(struct hstate *h, lon= g delta) alloc_nodemask =3D cpuset_current_mems_allowed; =20 lockdep_assert_held(&hugetlb_lock); - needed =3D (h->resv_huge_pages + delta) - h->free_huge_pages; + needed =3D (h->resv_huge_pages + delta) - allowed_mems_nr(h); if (needed <=3D 0) { h->resv_huge_pages +=3D delta; return 0; @@ -2312,7 +2329,7 @@ static int gather_surplus_pages(struct hstate *h, lon= g delta) */ spin_lock_irq(&hugetlb_lock); needed =3D (h->resv_huge_pages + delta) - - (h->free_huge_pages + allocated); + (allowed_mems_nr(h) + allocated); if (needed > 0) { if (alloc_ok) goto retry; @@ -4513,23 +4530,6 @@ static int __init hugepage_alloc_threads_setup(char = *s) } __setup("hugepage_alloc_threads=3D", hugepage_alloc_threads_setup); =20 -static unsigned int allowed_mems_nr(struct hstate *h) -{ - int node; - unsigned int nr =3D 0; - nodemask_t *mbind_nodemask; - unsigned int *array =3D h->free_huge_pages_node; - gfp_t gfp_mask =3D htlb_alloc_mask(h); - - mbind_nodemask =3D policy_mbind_nodemask(gfp_mask); - for_each_node_mask(node, cpuset_current_mems_allowed) { - if (!mbind_nodemask || node_isset(node, *mbind_nodemask)) - nr +=3D array[node]; - } - - return nr; -} - void hugetlb_report_meminfo(struct seq_file *m) { struct hstate *h; --=20 2.54.0