From nobody Wed Apr 22 23:11:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g1FMV5Zbhz6b2gc for ; Wed, 22 Apr 2026 23:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1FMV44fHz3Y28 for ; Wed, 22 Apr 2026 23:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776899462; 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=zapWbrOSGGfWD5fiwvvxbBwf18Xrstp9+1PqcPjGJXI=; b=v/3y7AwpVl7e1UM7UO3FcBe2Nb7XBTYHPE8kEMi5Kf1CR4GzVPT9ElM1Qan2m3d/6VP7FZ Yd3+vt7CxH53JAaZQaW5g1ze7HgL7HERwLpkAYJUAYhL0OPavmWqyEujgXySBCRvY5PMLP 1thX79wGC8OU0qP7J6ta6x4DpUopI2jCza8u0axBB1LA6F9Nf9Ti7K3iLbKezF7MMKrku9 xF2muCOaPKq30UrdRJTUq3NpE64QUT4lzh99kIMPKZ1rmVb7PC89sZlLw9c29Xi4juT1jW xefgneY4PJpIF+z4J8N7Becu7kOnRVlNYJTagMaB7VTCtyXExiTH1w+0jBpmIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776899462; a=rsa-sha256; cv=none; b=IyKoMhqdOq1GTgudV5zJcXmqd9wb8z9rVUXWNxGGq7TvTK+bEj18n/2ZTbzhSKfLDvz0qx KTFuquEOCSvg7UBNdgF1POI7drbMgarKGtoQsGsxuz6hUZKY3C0dfMFs0CK79w41TcvR8m CaB3RqciYIQRxlm1oLJVe+3noR4q4WxP9nA2sua2syLeNxu3p4Ep3RzC1wlx/CnXAWzcLu e4s8J6Zg3AqagM1cBdiGLSsaZpuVc8ypmwR0lwWueKdRbdFOwEhaNXc5ZxLmtWs65lD2sq kQ2/vzBZ34xx11HS9Fdt6h/M0VbzYzX9C/1ubCYqo/CFrdKWwb1IwldHK2VMbQ== 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=1776899462; 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=zapWbrOSGGfWD5fiwvvxbBwf18Xrstp9+1PqcPjGJXI=; b=Gw96eG8A4yHdABJ4elHIb0LvT2o9MLgQEr0rDRDQUS/AqMfsGUdS3gCfVHlm1ob3eq1EuG dONfgmcbMafFLOwAZEZZetHs/pSSXZFG6mGOQiDLXCpL8tdTw2fQuzBJJCvM6pOCfTkggS E8QOqh8G/cWUCmoLPHhlG1mD1ctjBnRQ9ZO6ri3jTrEw1SwDyOy5l/z8kqSfXmu7p3mZMS zluT8oDY7bnw6nuidCB9pxtCq2oXb9AKWMWt8Jl2nxjJHLLQz+Bh/ksIDScMXe6yKoNeLl Mdq8vSIGD5q15MIAfc9pLeR7kozmWqV3cZ6HOv2ZpUZhooaPzwnJp99AcjSAvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1FMV3PF3zrJW for ; Wed, 22 Apr 2026 23:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d890 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 23:11:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 06a51a510a60 - main - linuxkpi: Implement __GFP_THISNODE in alloc_pages() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 06a51a510a60ca29193b2cdb8120b630ea9ef18c Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 23:11:02 +0000 Message-Id: <69e95586.3d890.15e4e16c@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=06a51a510a60ca29193b2cdb8120b630ea9ef18c commit 06a51a510a60ca29193b2cdb8120b630ea9ef18c Author: Jean-Sébastien Pédron AuthorDate: 2026-04-22 16:27:32 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-22 23:10:41 +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 Differential Revision: https://reviews.freebsd.org/D56590 --- 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);