From nobody Thu Apr 30 19:42:51 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 4g64Mb2ykzz6c7dy for ; Thu, 30 Apr 2026 19:42:51 +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 4g64Mb1KSMz3DGT for ; Thu, 30 Apr 2026 19:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777578171; 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=6DpsECMsCwPZLcHi3YR6a3Og7zcspBGd8jV98QPsSsw=; b=L1aED6lX8MK6hky7RfEZMfu22a5Xy8SXzOHenGIhPR6pGrxLCI31fgwRH0AbG/7pZDp4A5 35fCX6APwZr08TOXaNPDVyNR5DVAlhaOECa3Ck9ZNVEaxwf4gq1xTvyuRunUBZEVLuTSs3 gxaV2tD71QcH2AqQTSs06Yn5xoQAWNg5a8hUr33XBidbnLahfkySshwg6AA4LpT0l3AnHW 48CXmOZEmxoQvVEa2PGGPzxhi+FIN9QPe1tbPCCj63ufH3gCEa5WkC8WQdioubJDtfo8VC 35Yaw0Dju1BFQI5IZPkDzWggrmwTE1mhvBazAzKR9kligILKsj8fYkgqjtHoPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777578171; a=rsa-sha256; cv=none; b=paELeASreHz7W80oxt6u1l4Y8BCBx7MlCkhnCA/5i2iqOR7/QvMTNnAjchDBoIeGAVmLkz E9JPnOYEmN13hkmA8HdzD9NQyquGFtBlZ++yDYWhNlU66JrRRzFhhS/d3XJKzMwc/vhbtg W2phW6rNRYtxdGCb7O2JdpVQWoymGZrL43OHSJqC4tf9JBnRtCI0X/uw386ZpKNsdp6wps a+eheppM1w8s9B4CDXPkW2H5Y9+Scyb85jJuW+tYkAxdJhLJ5+xXTo2FWCwmbSgKCJq88+ adnbwZzEZekGxqVJ/9FdmMQPKNYBW+AucmtZ3S4YHPC9XzSnMle+oZlXeIUUZQ== 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=1777578171; 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=6DpsECMsCwPZLcHi3YR6a3Og7zcspBGd8jV98QPsSsw=; b=uhCGbCCd3lScymOibwOwrr/ryXY9M6YuRuJYFh4r0EU8vqBUSPxmP9Xa1ayM8a3bUUU3yH vpUhhoDfmhL/IHdDKMfugwTyxQb10EN7JQeMZRpqF1MbWSgeHvZDFEtmiNJiUlLxXAqJCx B1xycFIpgPGkpeJvy4hHaac0y0DOoYNJcigrvePQh5rDeF/VHPxDx0Hhs5dWp2F5Hw+fxW n+Kz63ORt/NYXDmF+SjqX05Nb/UL8UsrEkGdVwNWP4h7snE/m2Ds5uhMPO8lsI3fh5GZu0 EVYz1f9K3OyJFkzzzAyaeBLUUa2GLufaimXuLtNjIWl5RkdItjdLoQ8JYq1Fgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g64Mb0tCbz9hB for ; Thu, 30 Apr 2026 19:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e64f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 19:42:51 +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: bf671f422dca - stable/15 - linuxkpi: Define `DEFINE_XARRAY*()` macros 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/stable/15 X-Git-Reftype: branch X-Git-Commit: bf671f422dca55350b26bfd0d25ff23cea690c60 Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 19:42:51 +0000 Message-Id: <69f3b0bb.3e64f.3f40ecc7@gitrepo.freebsd.org> The branch stable/15 has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=bf671f422dca55350b26bfd0d25ff23cea690c60 commit bf671f422dca55350b26bfd0d25ff23cea690c60 Author: Jean-Sébastien Pédron AuthorDate: 2026-04-13 21:44:16 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-30 18:07:12 +0000 linuxkpi: Define `DEFINE_XARRAY*()` macros The `DEFINE_XARRAY*()` macros are used to declare a static xarray. As the structure embeds a mutex(9), we also need to declare the static mutex after the `struct xarray`. Thus the slightly awkward definition of `DEFINE_XARRAY_FLAGS()`. The DRM generic code started to use `DEFINE_XARRAY_ALLOC()` in Linux 6.12. Reviewed by: bz Sponsored by: The FreeBSD Foundation (cherry picked from commit 796fff59a5d32bc3be14feaeb228fc15ef43eb32) --- sys/compat/linuxkpi/common/include/linux/xarray.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/xarray.h b/sys/compat/linuxkpi/common/include/linux/xarray.h index e6511130d50c..b26aa6f0d13a 100644 --- a/sys/compat/linuxkpi/common/include/linux/xarray.h +++ b/sys/compat/linuxkpi/common/include/linux/xarray.h @@ -54,6 +54,18 @@ struct xarray { uint32_t xa_flags; /* see XA_FLAGS_XXX */ }; +#define DEFINE_XARRAY_FLAGS(name, flags) \ + struct xarray name = { \ + .xa_head.gfp_mask = GFP_NOWAIT, \ + .xa_flags = flags, \ + }; \ + MTX_SYSINIT(name ## _mtx, &name.xa_lock, \ + "linuxkpi_DEFINE_XARRAY(" #name ")", \ + MTX_DEF | MTX_RECURSE) + +#define DEFINE_XARRAY(name) DEFINE_XARRAY_FLAGS(name, 0) +#define DEFINE_XARRAY_ALLOC(name) DEFINE_XARRAY_FLAGS(name, XA_FLAGS_ALLOC) + struct xa_limit { uint32_t max; uint32_t min;