From nobody Wed Apr 22 18:10:18 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 4g16hW2ldnz6b2nJ for ; Wed, 22 Apr 2026 18:10:19 +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 4g16hW13Ssz4Dh8 for ; Wed, 22 Apr 2026 18:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776881419; 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=Hja5NOpGJAbcHiqz8o3wjxJkRGg45Y0lEDxw2oEAbk0=; b=K5nOmiJv45HDTpUmMqF/LLoUdMQWtogrZGc597eGvfWow6XUyudg4wO5hR+tfQgTHFt3/j thZsWnaWzvLtcHW8g39qLr6O8mt432WQ/7yQevj8t60zA5S/fBj6MHwz0L1oQ2WXV+x2VV L2n8KLxesBKqGkc1yZ/Q7AGQXHL1vN+LCFCbCUoxm2A8vtTuc3u84kEggKOG3u4HZVCHiw IcU/GQqbS7Sglr8+u0e3k8r+ZVobCQwTxpSMedNTg1aiEx6+oELddZKZiStIjKYgYPc2Uy W8gqT3chqw91vpfbWDw7K5a329JgLCz0bmNHVHb7Lfa8QN9ZOsTSHoMNx6qX9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776881419; a=rsa-sha256; cv=none; b=HnZN7cFubEt//yFMV/ggBjs2Y/dypBUb75GfCkHBpoOFvyMyzcUBAviGTJhzAmcNmqTZP9 NMfKa0Z9j5/7lBuIb7zvDvMVN6lrjvoxmfgwwv4t8KeePtkbxYEFWkj8U65h17T8+6IodB cI5EW5+nt3G7ij/uidnlNtfKHX5m9km+vT3B8uX16ItZZIh9/aJ/QD6EqwZ388xcGQHP4P Hxl15Bcmlzl8q47WJ1Z5H64dkv4jyzDADZhqS/UeOebny7DqG4/a5F8GohPaZU+DPAPkkQ WvPwDwLxwYHp//XtD36Xo00IXPKpzG2WFqsg7JE1Bo/eiIgmoUR6dlQHog8azQ== 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=1776881419; 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=Hja5NOpGJAbcHiqz8o3wjxJkRGg45Y0lEDxw2oEAbk0=; b=j/kwj92qP5h/z04Ezhlvd4m8kS5T/TDsiwNTXsdfaIChbO3x0pVBKUUZRI8Ck/Cvh6jnkF pBQG1DkBikQNpOG/zNZ6PqmZZ1MfBjw6APJcOYKq4k77mPElmTynM634RCIsrg17u9UURM RO7EKWE9CIJ8dufQ4bx0fIGPwzZ0B19NX/g6jz3DURvVRmAlk1vqHCrLcdhzTRk1K5rtfx Dv2vFFGXExoSd/2KqsdfTLL9oPFLpU1L6d0Vz2ZHmytEJMdcWdW8l5l1h38TGeLKwIbgY/ 52af8fGg2PEdEUItnfO+IDJdCJ6Ggg/5gDT976DB3GcXW7aiWmAKib/QBtIndA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g16hV6xKWzhB7 for ; Wed, 22 Apr 2026 18:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 452b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 18:10:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 84fc57a369df - main - linuxkpi: Add more `struct folio`-related functions 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/main X-Git-Reftype: branch X-Git-Commit: 84fc57a369dfac882cb9e9333635aaa11978948f Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 18:10:18 +0000 Message-Id: <69e90f0a.452b0.76b2379f@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=84fc57a369dfac882cb9e9333635aaa11978948f commit 84fc57a369dfac882cb9e9333635aaa11978948f Author: Jean-Sébastien Pédron AuthorDate: 2026-04-11 14:19:39 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-22 18:09:53 +0000 linuxkpi: Add more `struct folio`-related functions The i915 DRM driver started to replace the use of `struct page` by `struct folio` in its GEM shmem code in Linux 6.12. linuxkpi were missing a few more functions: `kmap_local_folio()`, `memcpy_to_folio()` and `offset_in_folio()`. They are equivalent of their `struct page` counterparts. One difference is that `kmap_local_folio()` takes an offset argument and the returned address takes this offset into account. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56438 --- sys/compat/linuxkpi/common/include/linux/highmem.h | 22 ++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/mm.h | 1 + 2 files changed, 23 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/highmem.h b/sys/compat/linuxkpi/common/include/linux/highmem.h index dc1c4fe2f299..294b2666031b 100644 --- a/sys/compat/linuxkpi/common/include/linux/highmem.h +++ b/sys/compat/linuxkpi/common/include/linux/highmem.h @@ -99,6 +99,19 @@ kmap_local_page(struct page *page) return (kmap(page)); } +static inline void * +kmap_local_folio(struct folio *folio, size_t offset) +{ + struct page *page; + char *vaddr; + + page = &folio->page; + vaddr = kmap_local_page(page); + vaddr += offset; + + return (vaddr); +} + static inline void * kmap_local_page_prot(struct page *page, pgprot_t prot) { @@ -168,4 +181,13 @@ memcpy_to_page(struct page *page, size_t offset, const char *from, size_t len) kunmap_local(to); } +static inline void +memcpy_to_folio(struct folio *folio, size_t offset, const char *from, size_t len) +{ + struct page *page; + + page = &folio->page; + memcpy_to_page(page, offset, from, len); +} + #endif /* _LINUXKPI_LINUX_HIGHMEM_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index 156b00a0c0f0..a639c0947031 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -264,6 +264,7 @@ vma_pages(struct vm_area_struct *vma) } #define offset_in_page(off) ((unsigned long)(off) & (PAGE_SIZE - 1)) +#define offset_in_folio(folio, p) ((unsigned long)(p) & (folio_size(folio) - 1)) static inline void set_page_dirty(struct page *page)