From nobody Fri Mar 14 16:25:39 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 4ZDqVD0h71z5qPxX; Fri, 14 Mar 2025 16:25:40 +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 4ZDqVD08h1z3blB; Fri, 14 Mar 2025 16:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741969540; 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=Oj2K0t48ChyFDtwdFypwUw+91FLcO+X2Nk860L5d3bU=; b=QM0WoxCGzzolUUK3mCCKeOPe0mvPr6w34Qc2+WWuPVpawXVQ20ypKixmRzVZT2YsuxRGAv rS5zBCQswvZMW0nFOFFBBklrN/PBIpOn9n9utG0fNfpdYOFbxHiUZKMDoOO/nIE8QxdL0Y xym142EuU8BTwgCP6ApPLwFgeepvn0rAJ8WN1b8zopW42Z0aaqB1XkqeaOgV9WJDgG0CgY XupgR85/b3g5t1R1U2gFnqzxjzTptD/aFjPJkmnsi0iZNHuLqYqY/wsfe9Qh3IRhWHieMF RFaipxLUs/299XUqN5FQuSC4R6/M8xQEXYtOeY07laA/o320pN4HITJhFOkYig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741969540; a=rsa-sha256; cv=none; b=pAd2XdsPo9Ao6Jhlm16pu5mvh4s+rYXTsKhZ5V3aA7B/iaubaEt9R556TYF5gxGmCgtE2T mil/6lwmG9Qcam1ehPZ3LVZZxAirN0ymE9bQUW0CJhQjTMdKA7yLXw1bXqbUsY87MgGf1Q gWjrZV/bFQ8ECSbT7aRQBhcVP3nEFqSAYPiuWvLmEN4cTvqd5DarOhuwrR6NhjRnunQKyQ dBAC58N4+Mf5BnqkotiNXxBH0r39O04P4Aoifehgv4o95LswyNnjY6QRfv4jOtKWNRNhGj BPulQdEw+vW55FFCtkc9c4q31Cy4cxR+hRj2PL9ooyo1lruLE4grb/AUKsKLXQ== 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=1741969540; 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=Oj2K0t48ChyFDtwdFypwUw+91FLcO+X2Nk860L5d3bU=; b=tm+i+xJIDJhP7DgIWOgChDK5T8X53ZmcUhmpOR1FCjklsRDsh1gERgWk+0m5jCzOLPAnsf R8t5REnov5RiwWKcKxpg+STUgHPkK+OB/JJne96yFK9WfN7ae8SewWYhi+lM39gopzgBtO KehR6vtWpzDCpT1O+P3En0V0yd2duszrkJeLhYSihS/hHC9BLxdSPbBQByu1+PHr10depn sRdeAuGwEOcKSLN6kRaET02Qu617FpH8oEjDPhZRaHsMRVDF3HUbjOTib9a6bDD/ZRLrdF mMfrygP1dBIVm5XwOfy3qMiYA08ofL8G3Dv+J+vtsfDoRCHcUrMdJRDw8NDI2A== 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 4ZDqVC6k5jzs3D; Fri, 14 Mar 2025 16:25:39 +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 52EGPdlv094825; Fri, 14 Mar 2025 16:25:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52EGPd0v094822; Fri, 14 Mar 2025 16:25:39 GMT (envelope-from git) Date: Fri, 14 Mar 2025 16:25:39 GMT Message-Id: <202503141625.52EGPd0v094822@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: a5c7b44d6a46 - main - LinuxKPI: always use contig allocations in linux_alloc_kmem() 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: a5c7b44d6a46fc5a67a79cb9b31050a9cc7c50ce Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a5c7b44d6a46fc5a67a79cb9b31050a9cc7c50ce commit a5c7b44d6a46fc5a67a79cb9b31050a9cc7c50ce Author: Bjoern A. Zeeb AuthorDate: 2024-09-12 21:17:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-14 16:24:52 +0000 LinuxKPI: always use contig allocations in linux_alloc_kmem() In linux_alloc_kmem() [used by *get_page*()] we always at least allocate PAGE_SIZE and we want the allocation to be contiguous so it can be passed to DMA. Always use kmem_alloc_contig() and only change the low argument depending on the GFP_DMA32 flag being given or not. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: jhb, dumbbell Differential Revision: https://reviews.freebsd.org/D46661 --- sys/compat/linuxkpi/common/src/linux_page.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 6ca926e89174..bece8c954bfd 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -182,12 +182,10 @@ linux_alloc_kmem(gfp_t flags, unsigned int order) size_t size = ((size_t)PAGE_SIZE) << order; void *addr; - if ((flags & GFP_DMA32) == 0) { - addr = kmem_malloc(size, flags & GFP_NATIVE_MASK); - } else { - addr = kmem_alloc_contig(size, flags & GFP_NATIVE_MASK, 0, - BUS_SPACE_MAXADDR_32BIT, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); - } + addr = kmem_alloc_contig(size, flags & GFP_NATIVE_MASK, 0, + ((flags & GFP_DMA32) == 0) ? -1UL : BUS_SPACE_MAXADDR_32BIT, + PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); + return ((vm_offset_t)addr); }