From nobody Fri Apr 18 14:36:49 2025 X-Original-To: dev-commits-src-branches@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 4ZfHQV6nX6z5stVy; Fri, 18 Apr 2025 14:36:50 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfHQV0wnjz3Jyr; Fri, 18 Apr 2025 14:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987010; 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=JILF8MvA9+KWEvDJAKpRUb7CxKvgTq43dBCSNrvidyg=; b=WEnlJchnCt+S4iwRaobg+pq7OQ2dXgcRBgAyFFFrqlPMC90rnx552colhs8OK7mfrKrovE h8xr0hWKIUFIH6Ifu+JMpIXtmPjh116Y+bXj+j9ECcBcCW6JuZgvUncBGdWcfB1yiLTpHv Gm+pCvM2AxLmYgj7tFmUOEyeEAWTlJxfgQAhipTkNg4FTFIQIyuUDWjBX0Objrcy4eASdm c+DD7E9FiwiskNIuDicxZBfexByq3IycSo7+tqoeMAzUWcDj7yjHu6bPa2EOn27s/KR1yV BjlsUQmAnrxBUJHI6yfZzTRZd520czLCjhNDGmcmpTgE/OsuPlCx3gTmL6LAqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987010; a=rsa-sha256; cv=none; b=q7O34Jr/w8KJkhtR0vPzN9AuWJMxFweX+qJQxC+6nli2XpL+QtjpQo8IPUaZn8bTaQC1V7 w/8COmcl9411ySl7RN/h6+f5mS9jfCqQN11ZaA2y1UBi11h9FJesys0Qs0tHuZwaUQIwap QEGnuPjMQJdq8AOke6AmYk3nmTKXNbzCC6bsjaOq/6LVjFVT5/LtjY4r1BAvssBiKLlbTd Uw70/Ty+YgXtJ3UUG3fEX9JkFiy7fu/uGK0XfPvaOH4GD1rGJx9xd72asMYgd7wYZeLq/C 0cBl8vxxiyT/I209heOK+p4cEgdtHCyORFE8TL9LQaFKrs1Jk0txdAq7P557Qw== 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=1744987010; 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=JILF8MvA9+KWEvDJAKpRUb7CxKvgTq43dBCSNrvidyg=; b=G49xV0NzgXWWxBx2X94wNdm3nW1CqJmzqsBHAU+ug+Ams9boknu2O646BiX+wRUtZkA5Vo KYQIP4u4HwC9T97reKywoGeE+VXj9d0Eu3oJ/bOPIzbP2+BtP2BjQGi3nPTk9sBqV5YR2P mMP0qlHOrFS/6xEhXYVKsxUKCqBKfq1FMNaxy2sRN6i+jhWEeqYQtD2bznPMsVZ28kiPoW zTNbitXLaTUHDSbOCqcWdDJuEagXGQZbX6ToH2F8RLelykk+xrRY8ombgVwlvNcSpCtoWm MSy9Atx1aRBXoDGVb7pA4qhBJuwhXz8CPcylbUAPJcP38X9OMe+vzGeYL74EIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZfHQV0SzLzf3l; Fri, 18 Apr 2025 14:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53IEantb091027; Fri, 18 Apr 2025 14:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEanqw091024; Fri, 18 Apr 2025 14:36:49 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:36:49 GMT Message-Id: <202504181436.53IEanqw091024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bc6e1ca80704 - stable/14 - LinuxKPI: make __kmalloc() play by the rules 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bc6e1ca8070467eca4e22e8dc0a4fc962169cad7 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bc6e1ca8070467eca4e22e8dc0a4fc962169cad7 commit bc6e1ca8070467eca4e22e8dc0a4fc962169cad7 Author: Bjoern A. Zeeb AuthorDate: 2024-09-12 18:11:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-18 14:35:57 +0000 LinuxKPI: make __kmalloc() play by the rules According to Documentation/core-api/dma-api.rst kmalloc() is supposd to provide physically contiguous memory. [1] In order to guarantee that allocations are contiguous even if using PAGE_SIZE or larger check the size and use contigmalloc if needed. This makes use of 9e6544dd6e02 (and following) allowing free(9) to also work for contigmalloced memory. Sponsored by: The FreeBSD Foundation Pointed out by: jhb [1] Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D46656 (cherry picked from commit 19df0c5abcb9d4e951e610b6de98d4d8a00bd5f9) --- sys/compat/linuxkpi/common/src/linux_slab.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_slab.c b/sys/compat/linuxkpi/common/src/linux_slab.c index 72b35fee9214..5be4c1ec674c 100644 --- a/sys/compat/linuxkpi/common/src/linux_slab.c +++ b/sys/compat/linuxkpi/common/src/linux_slab.c @@ -215,7 +215,11 @@ lkpi___kmalloc(size_t size, gfp_t flags) /* sizeof(struct llist_node) is used for kfree_async(). */ _s = MAX(size, sizeof(struct llist_node)); - return (malloc(_s, M_KMALLOC, linux_check_m_flags(flags))); + if (_s < PAGE_SIZE) + return (malloc(_s, M_KMALLOC, linux_check_m_flags(flags))); + else + return (contigmalloc(_s, M_KMALLOC, linux_check_m_flags(flags), + 0, -1UL, PAGE_SIZE, 0)); } struct lkpi_kmalloc_ctx {