From nobody Mon May 12 17:46:51 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 4Zx6Vh1PPhz5wKTG; Mon, 12 May 2025 17:46:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zx6Vg6kxQz3gly; Mon, 12 May 2025 17:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747072011; 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=eqlUmrwnAvQyFD3FXT0bTG+52khm/VZ5dk8gUTgGmZM=; b=YIB0cnNMtcFUdu4XMjp6oQbsVzLCT9D1j/tdWTc67FSY05f1UEgtm3YsYtWCHG8NpSg8ma y8zEYj+cXepQMRJPeIPg99uU/z7bjLysz5+X9+8h5QzPsEC1qjAp+4vpsUoeUFQ4XjKyNS acVwzNo9k/faEMYGp6e1qn/j4AJgGUtDEFbzsJfz/qhzWYpZqxdlH7COaP31RH3M8hG63+ epyLXtPj1NVspYdltyfcaREdFib0P2RDe0C1IvBbh0tPdWzTwLf+g+tIKv2+XFfoAOslVp +y4f/IaHJAIgBrXXIoUOT61x56+U4QYNanJcgR6GmxaVR5f7mV0ua2f7YGm6cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747072011; 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=eqlUmrwnAvQyFD3FXT0bTG+52khm/VZ5dk8gUTgGmZM=; b=huUZvuoEVvF/XHsxm+f0gwmiHMT9OGS6sfp/qBWfshJ0d6X/SQGpOi1f2cCdHx7ruC73MZ gE4mYE5vPuibpxC0gBEyy6krVTkP2vmzB/OewEcP7lrEcfCXZpvhfc93hcV9OuM049yjAj YEZIzU4lYVoSx8mZJTb/+pRN2QCs2OTNt1rGs2W0h5BFhc0TIbinWMdcrn1+RF8QTBgnUf d5XWUsWQINxLmcRd75n18TeiR0ro7Tql0EDjPWbHOxlIZTPZxiw10oDFrUPRN518B1I8eT MI237wf5FYDqDpdm4An9uBBVPoWB2ZV+MOnAaLBVEHv3hEXSOXhvyJ0HwLt/5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747072011; a=rsa-sha256; cv=none; b=bQb9/OrUMH3T1FfdhW1JaAxpk4x4RqCOgn1oFvFClPRcY8jDbkNuRlrUBfQqrv/c/5CWWF OuJR03R+ZEYxXIl18nwtjwuNBJHhJtTri0tbUHkKFPWq6U0LvmdsPb/qwEbTxKcubRRuxR QJNL6IsRr6Ex+o3rQGp/b1hNGCNo+hfoN3yF3stJcMASphfY11Q9jLgBvn1war9c2zCRFH DEUW0iqAZ7vKpeJjiqPEV9p5SNKpCAMljPSl+Bx26TCq7nyqpvGaP2ouWBHTy3h2EDXuj9 gtIujuuMROV8N+mwl5Hwu2x6kf52+MI5rcHi4plgIeG6qkHRWbYdkRMi1ccV8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zx6Vg5l6sz1QCk; Mon, 12 May 2025 17:46: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 54CHkpmu035375; Mon, 12 May 2025 17:46:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54CHkpwR035372; Mon, 12 May 2025 17:46:51 GMT (envelope-from git) Date: Mon, 12 May 2025 17:46:51 GMT Message-Id: <202505121746.54CHkpwR035372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: c8089810a940 - main - linuxkpi: Make "free page" code paths closer to Linux 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: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8089810a94027b7f937b9e63d2d8d31a02aaac5 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=c8089810a94027b7f937b9e63d2d8d31a02aaac5 commit c8089810a94027b7f937b9e63d2d8d31a02aaac5 Author: Jean-Sébastien Pédron AuthorDate: 2025-04-13 11:13:17 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-05-12 17:08:02 +0000 linuxkpi: Make "free page" code paths closer to Linux There is basically one code path to free pages on Linux. In particular, `free_pages()` is used for other pages than those returned by `alloc_pages()`. Also on Linux, `release_pages()` takes either `struct page` or `struct folio`. `struct folio` support will be added in a followup commit. Regardless, because pages come from several sources, `linux_free_pages()` need to accept managed and unmanaged pages. Reviewed by: bz, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49813 --- sys/compat/linuxkpi/common/include/linux/mm.h | 3 ++- sys/compat/linuxkpi/common/src/linux_page.c | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index f523395cc71c..569e2a8b70f1 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -278,7 +278,8 @@ get_page(struct page *page) static inline void put_page(struct page *page) { - vm_page_unwire(page, PQ_ACTIVE); + /* `__free_page()` takes care of the refcounting (unwire). */ + __free_page(page); } void linux_release_pages(struct page **pages, int nr); diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index c299457f042a..7ce52cbf95eb 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -165,8 +165,24 @@ linux_free_pages(struct page *page, unsigned int order) for (x = 0; x != npages; x++) { vm_page_t pgo = page + x; - if (vm_page_unwire_noq(pgo)) - vm_page_free(pgo); + /* + * The "free page" function is used in several + * contexts. + * + * Some pages are allocated by `linux_alloc_pages()` + * above, but not all of them are. For instance in the + * DRM drivers, some pages come from + * `shmem_read_mapping_page_gfp()`. + * + * That's why we need to check if the page is managed + * or not here. + */ + if ((pgo->oflags & VPO_UNMANAGED) == 0) { + vm_page_unwire(pgo, PQ_ACTIVE); + } else { + if (vm_page_unwire_noq(pgo)) + vm_page_free(pgo); + } } } else { vm_offset_t vaddr; @@ -183,7 +199,7 @@ linux_release_pages(struct page **pages, int nr) int i; for (i = 0; i < nr; i++) - put_page(pages[i]); + __free_page(pages[i]); } vm_offset_t