From nobody Fri Mar 14 16:25:40 2025 X-Original-To: dev-commits-src-main@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 4ZDqVF57Fyz5qQBn; Fri, 14 Mar 2025 16:25:41 +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 4ZDqVF0fxFz3byV; Fri, 14 Mar 2025 16:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741969541; 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=xmAWW9sy0CzzRSwJPZJ+1qyT/7JJeUopdmwJRMWrAdk=; b=jQqqcLL28NRCxs2STzluePyJzdaDUalmX5jCLQN6BOJYlDRRzySSxHOWqfIBty6licJhhd bzPO7SwLkCdC+3pyfAbbvAI7HnSZYkHjM6mxPbKCZB/Y9xkGOWDEf250TVl+fpBng22Xq4 WJcs3CAFvvfr0TdV/MLPhgJeWrSCQLXBo7ytUuWNh4rZGhfjGQiNIoCwLuBqV8rl/Z2r62 upDUwH2zNdsVAcAqQCie5rxnn9BKQ83peByx+ETf9gQehT0B9hUzn4DsLtMY4TdR4p4LLP mfVo/OzdEGTl9fa3wK3WdT42Z0YVq535c8sfc7iV6G8laMiYYCdlWBgl63/r0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741969541; a=rsa-sha256; cv=none; b=LeeY1aFOodu9K2IuIUuKbLpJPFKx46c1SOUTi1iQAAtZgOcVg7xIHyKkRF3L7T0uZQm2sJ +fOQ3HFP6PvcJRxfazS+WCJQIozGZV8H28OPIuZnbZCeS42L8AWKMv7VQnwI4ddOVB9L1X 4Jf2wDIhCjCPgpABANb9tTu1l9eF3wp5Teu8uALTk95YpIRfarE4VlS03/r9j76RTOD1hg wyYjU2PZKOX2VNT8OUcG5DW4DAT6LZBWTYRnDnkrSm6HL/H0U0q8Juu3RrN3e2H2N5kPmZ GDjx9oH52HwCN8SjZ6yiykgOQZc007yBj/6Iw4sdERhvo16sTuDB9qp9tcllBQ== 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=1741969541; 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=xmAWW9sy0CzzRSwJPZJ+1qyT/7JJeUopdmwJRMWrAdk=; b=H7Sms0U8KF3ALHQffUEYHfbr+bEAIqpssyVCzZZAgxyvvcHgkD8URoP+xKmn5sSdduAW9l gSibwnQlS2/hGmZORVWjD28fvxgWia99aBK4fS6leP76XMhg78lnlajf+jXz7YxTWMwIpy 8LNHYwc008BK09qXkTBTUptiwGGE2FnIOL9ZuEYKGMMmMpnwBMG7yXMB2m6pauoN8S0ZMA b7Uz77NQpTy0QxAGRF7wz2SrB+9uUTGbQn0721YG6iEbckTvQKwm2FenoleurfN3x6V3on 01CKP1lkdEld3WoW5xQTjckTN6wYD23YzgwKn+i61yQyBYqArzkf9VV9GMfaUQ== 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 4ZDqVF0FfmzsJT; Fri, 14 Mar 2025 16:25:41 +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 52EGPeSx094862; Fri, 14 Mar 2025 16:25:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52EGPeak094859; Fri, 14 Mar 2025 16:25:40 GMT (envelope-from git) Date: Fri, 14 Mar 2025 16:25:40 GMT Message-Id: <202503141625.52EGPeak094859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 19df0c5abcb9 - main - LinuxKPI: make __kmalloc() play by the rules List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 19df0c5abcb9d4e951e610b6de98d4d8a00bd5f9 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=19df0c5abcb9d4e951e610b6de98d4d8a00bd5f9 commit 19df0c5abcb9d4e951e610b6de98d4d8a00bd5f9 Author: Bjoern A. Zeeb AuthorDate: 2024-09-12 18:11:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-14 16:24:52 +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 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46656 --- 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 {