From nobody Fri Apr 18 14:36:51 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 4ZfHQW6YPlz5stY1; Fri, 18 Apr 2025 14:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfHQW2VQ4z3K1r; Fri, 18 Apr 2025 14:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987011; 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=yi7P47Huyzd7PPQ1TZ5nMoiyBPVk81Rr4RYMZaxPVM8=; b=Gphi9tMRXp+6kQvZE44xj6EukorftIK1PaBIbF3p3i2HmmT4Mlsuh9sf4AeOhPaI/9CGoo l7gKyomBCFk8P4MIqhRynE8DwM32Z0ogIMDiAFb6u3q4floRQg9Hq1VJ1OZ9QTM3q4JGwn wPXkuWxfbStA+IVJGmWSjdDayzY7b8BmYE8tMO2zp6brL8ZuowNbDzv/uHwBcStcpamC4O DApOEVRI4JcaITz+B7vq8LlQzplIiVar6K2yCeOraSsYwSrvFmGwb6eC6evqscAqDUnVHY MLxnsYHMM15Tv/lCSRzrnjiEJN/G+c/YjRLrjWrg2J+3qyxJOgN/kFs/YH1prw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987011; a=rsa-sha256; cv=none; b=aU4zpVRZ8jGDYe2ZyuxgVp7j+/zrLmwzNt0uLfyWBJWF5x29+LVi1jpRbSaq59RQhPMLAF qwAmwigW3zf1BrfD8Xot6Q3PesEWHLLibLbFV2xrbN/oV8Z+ZWdC69Fi8jxXVVI/OLpQYu tZpRXK3EuET+5GqFMyqmqNYJ2wElwDPAT2WTQ40iKACKWJ1lXwmh9o9a85vhY4HrCveMxk TMLUazf5qfAK4gTTgvhQblbNaXewDTBK34lmrUexD0DU/SKD4VuwOyirzLQLhhjTUBexQ6 hLEaLxrYMuoQgqs9FZOBjE7EvLBALvaIGuMXUIYV7bSEpamfWu5DuP/SEfLaQg== 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=1744987011; 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=yi7P47Huyzd7PPQ1TZ5nMoiyBPVk81Rr4RYMZaxPVM8=; b=QF6yo3nc7DFYEXskzqQsiwojH4B5RUoLQSyqG5AwWg31mv+8GUHDGsHuRwggpP8Kvc0xbP 3tdP8KqUzjTaQiiBsKHvNVTZkoZzFjWngAAw4rta8lGdNT2OKN7lDWyBtjRhUdfF5NI5g0 Z/IWQ3XtMv1Sq4L9XepbpuJSYIM0oby4nsUfRG3IGUnpdkOothI6nEbTUNyOQspzuX/8aR BlXMbgC2kZbgR4/Mk/0S0r6IlnH4QJPE2oaLJbf2KxGUsx1OoGDbel8sztpAG68pe6ZHO9 p9IyLMbdbmnMgb1wJJUdkadkk6Y6cXZ3wStuPDkSpX65dmzbIPC2/JHdO3JZQA== 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 4ZfHQW1Hm2zdt8; Fri, 18 Apr 2025 14:36:51 +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 53IEapEu091064; Fri, 18 Apr 2025 14:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEapbs091061; Fri, 18 Apr 2025 14:36:51 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:36:51 GMT Message-Id: <202504181436.53IEapbs091061@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: 3494f4f5369d - stable/14 - LinuxKPI: always use contig allocations in linux_alloc_kmem() 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: 3494f4f5369de2661c88f3217acbf8d5f0795780 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3494f4f5369de2661c88f3217acbf8d5f0795780 commit 3494f4f5369de2661c88f3217acbf8d5f0795780 Author: Bjoern A. Zeeb AuthorDate: 2024-09-12 21:17:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-18 14:35:57 +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 Reviewed by: jhb, dumbbell Differential Revision: https://reviews.freebsd.org/D46661 (cherry picked from commit a5c7b44d6a46fc5a67a79cb9b31050a9cc7c50ce) --- 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 cc7683e3b572..99b63e8d5680 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); }