:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=12JTWzBxTIEZAJIoYHIHqytD1d5EUGsYvtOMgGDnNvU=; b=ngzKZ4StnugP485Empr/di52A7KUL/K2KZKLaQTSwfCR3f0xsD0gvF4cgVyhzYNltAYS8r wKfpl446vrKtF3iNsGKLuy37IckRQC0ZXfK172zVGma84lZGW2IMVxwhdEJ8FQ3jvl6VhK ccNDGl6zsbgZxK0BpVDpAWhOJx3f1hkar3suwVHAWtZCgBUn3HIqm8Uv6dfwg/g5avhOhi jZMoTUpek/pfBSZYZ8FfhI+WM30D2ryvXUBapzoflgOfVTuXNV6Y48cy1Kfzme0AaleQvg mpNZTmrEvC9Kqd0CqW5/qI7jLpN2wE7FUn6UL/30brrtrgX1X26GSk5Sx3ZVQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777498997; a=rsa-sha256; cv=none; b=Uhs0XnEDMvlZeleUDv1gEEKS1P6Ueq73saVxZLLO+cPc0XEWqyPSY/esioGjn64JExszYf sKFXxTQGRvvP2zu5z7ZwKahYFiLUlJn0J0i788JCkTL9LSAUmG5VymfgWc3KBu8WieEimM plrGr86d2Bfh3sXfblWwtkonzK0Tx0qFlfVYrR25QUHTX5QZ+uZPmE3Eswv/0WFQ8IhXBH ctOm+kxo/jjjTRT6RHu9CAmgN+SQDOqpOpT3sYZP6KIugP6HDT+ZvqL900mLUQQ+xzylK3 PRX0iOLaY8tBbevZpyJ+brnaiN9Kbf69GfC+hG5qzpDGLd6aT/yn2XAlrAK9Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777498997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=12JTWzBxTIEZAJIoYHIHqytD1d5EUGsYvtOMgGDnNvU=; b=ufko0Ewcc0sR4ZhhXBNCFk/OP0/7cAx5+RAs44p7Qf71M7A9PQVwGx3k0p7ItgPZB3jVkM p82U7fRFZe5axxPzAGpK8pK0xTxpmWyxF8batnZ7MauycKS2LpOnXapfLTxLdjutRKupBL 6IQzzfoIJ4b3hGucwb5uVTkr7REureAuJI3qu+96skL6S7IjS7QoqkwoJZdQ24xAXrFNuK 5Xmo6oVrRQdOJV5oz4jXwi1tJhpCszTQc3SG+h/nPQZVQiY3Ee0Bs5wtZZDFbixtn6Fg61 RrU322X1rlY4HFJs4F4PjfuF0dx0yV3PS2KGX/CX3Rfav0oFfXh9UCOZlfZhcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5W506kvtzymG for ; Wed, 29 Apr 2026 21:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18e06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 21:43:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: bffaea681802 - stable/15 - linuxkpi: Implement __GFP_THISNODE in alloc_pages() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bffaea68180296c827f77064fa1b023532f2004d Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 21:43:16 +0000 Message-Id: <69f27b74.18e06.1e37baea@gitrepo.freebsd.org> The branch stable/15 has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=bffaea68180296c827f77064fa1b023532f2004d commit bffaea68180296c827f77064fa1b023532f2004d Author: Jean-Sébastien Pédron AuthorDate: 2026-04-22 16:27:32 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-29 21:04:30 +0000 linuxkpi: Implement __GFP_THISNODE in alloc_pages() It indicates to `alloc_pages()` to allocate the pages from the current NUMA domain. If it couldn't, it should not retry elsewhere and return failure. Reviewed by: bz Sponsored by: The FreeBSD Foundation (cherry picked from commit 06a51a510a60ca29193b2cdb8120b630ea9ef18c) --- sys/compat/linuxkpi/common/include/linux/gfp.h | 2 +- sys/compat/linuxkpi/common/src/linux_page.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h index b94cbada0435..5c638be92beb 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -59,7 +59,7 @@ #define __GFP_WAIT M_WAITOK #define __GFP_DMA32 (1U << 24) /* LinuxKPI only */ #define __GFP_NORETRY (1U << 25) /* LinuxKPI only */ -#define __GFP_THISNODE (1U << 26) /* Unimplemented */ +#define __GFP_THISNODE (1U << 26) #define __GFP_BITS_SHIFT 27 #define __GFP_BITS_MASK ((1 << __GFP_BITS_SHIFT) - 1) #define __GFP_NOFAIL M_WAITOK diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 82f3a2a4639f..d8b65a12dc67 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -119,10 +119,19 @@ linux_alloc_pages(gfp_t flags, unsigned int order) req |= VM_ALLOC_NORECLAIM; retry: - page = vm_page_alloc_noobj_contig(req, npages, 0, pmax, - PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); + if ((flags & __GFP_THISNODE) != 0) { + int curdomain = PCPU_GET(domain); + page = vm_page_alloc_noobj_contig_domain( + curdomain, req, npages, 0, pmax, + PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); + } else { + page = vm_page_alloc_noobj_contig( + req, npages, 0, pmax, + PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); + } + if (page == NULL) { - if ((flags & (M_WAITOK | __GFP_NORETRY)) == + if ((flags & (M_WAITOK | __GFP_NORETRY | __GFP_THISNODE)) == M_WAITOK) { int err = vm_page_reclaim_contig(req, npages, 0, pmax, PAGE_SIZE, 0);