From nobody Tue Jan 9 18:00:00 2024 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 4T8dxY1tBgz5656m; Tue, 9 Jan 2024 18:00:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T8dxY0xxlz4PjC; Tue, 9 Jan 2024 18:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704823201; 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=tHgE46vjHa/Q+mDcVEBVY/AjqcjQZOyDqdK40mw1hHE=; b=gaq0VfCNWBolYogbMgLWjl+PG7SKcWFpp31XLim4vO25GPSbKxA11+EhSJ9uPZ5p0ZcBzh RG6YaBS/n78A9peNl11k4P27v4AjzRajp52mQ5JIROiVuKA/84QNC8xArJD8+OuHeLc9Pm tN46lE0FZn7rm5Nebz5+SUoe3d/FcGhxK84gClkxOT8F+rghvo2NhtL71iFp4QgzbZvdMf rCeiZemfRVTLkIU56WsdYDeHOs8w5YgoZifxTgZ+TteiqHl/HeUnl09BOFQje/q646WKwG XOk0R2NOKj3hJS4cEWlJyPqpeGKtX1pPIGf5RIID2HggXTb71E2QnPTGZcMfSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704823201; 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=tHgE46vjHa/Q+mDcVEBVY/AjqcjQZOyDqdK40mw1hHE=; b=eQtyQF5yBMsKndDXDtjY8aWYKyAGOrZacoU1zClSPhqZQSjU5qyQc5+S0WoHUXXic8BCIE sEUMBvZV4z0IT3N2iHrsVmmPNOsTssZw7QNrZDesM3EozZgiYU700I/P4ddLXsbkZsF1VD PZGhEMrR6cCC1jOrBfJ7sVxFdM8KJStWkJsQ4bhYS99u90Q6NoyDkGmemzwZW2eBlrovoQ XlwGnrTP/FedHea6b4mPuwxzB562Qg34eZBV+iFvxMxbXxbFSv+DmrjEFcUQDe0VWZIDGv VM6iVGrqyb/sBdnSRda34DCq1NrOkCs/iN/tcGiBcpIBlOY3XU6/YNB5yXBU1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704823201; a=rsa-sha256; cv=none; b=SHUhjzPY99AJ/ay/sxVQ1vhfpthMDDNJ2LRQimGMZE3Mw5VqNi9lUZ1iqv3VXV00ITKRaE 1tS4gfWkEQdalMe8MDmDrF/51KR3o+P/V8ObXje+pFgwW7zDTCgaEWJrwKM10IxFURUOhQ pootctciSKpUc3dsPXXAMyyeR21kvl1ej9jWuKE1xiVo988TYDn0haxF/GyKj9YttUR24+ YzHTIMutr1jVAlkbMABDLEBmexx4UdLV+QaJ3SrbtXQun64Ls2j1fWVyqWUOvO8X5P25oP gly2GnFYvCq6QlJqSg40gS+0iPSDZC8KLPfvMLofVIkBUsc2OkahLAeSqdIEZw== 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 4T8dxY03rqz10yT; Tue, 9 Jan 2024 18:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 409I00HY082190; Tue, 9 Jan 2024 18:00:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 409I00Dm082169; Tue, 9 Jan 2024 18:00:00 GMT (envelope-from git) Date: Tue, 9 Jan 2024 18:00:00 GMT Message-Id: <202401091800.409I00Dm082169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6cba7aec21bc - stable/13 - linuxkpi: Handle direct-mapped addresses in linux_free_kmem() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cba7aec21bcd957478a987f9391fd33a4babdac Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6cba7aec21bcd957478a987f9391fd33a4babdac commit 6cba7aec21bcd957478a987f9391fd33a4babdac Author: Mark Johnston AuthorDate: 2023-10-17 14:26:18 +0000 Commit: Mark Johnston CommitDate: 2024-01-09 17:59:49 +0000 linuxkpi: Handle direct-mapped addresses in linux_free_kmem() See the analysis in PR 271333. It is possible for driver code to allocate a page, store its address as returned by page_address(), then call free_page() on that address. On most systems that'll result in the LinuxKPI calling kmem_free() with a direct-mapped address, which is not legal. Fix the problem by making linux_free_kmem() check the address to see whether it's direct-mapped or not, and handling it appropriately. PR: 271333, 274515 Reviewed by: hselasky, bz Tested by: trasz MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40028 (cherry picked from commit 6223d0b67af923f53d962a9bf594dc37004dffe8) --- sys/compat/linuxkpi/common/src/linux_page.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index d59435ba934f..e732d6ff5047 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -145,6 +145,14 @@ linux_alloc_pages(gfp_t flags, unsigned int order) return (page); } +static void +_linux_free_kmem(vm_offset_t addr, unsigned int order) +{ + size_t size = ((size_t)PAGE_SIZE) << order; + + kmem_free(addr, size); +} + void linux_free_pages(struct page *page, unsigned int order) { @@ -163,7 +171,7 @@ linux_free_pages(struct page *page, unsigned int order) vaddr = (vm_offset_t)page_address(page); - linux_free_kmem(vaddr, order); + _linux_free_kmem(vaddr, order); } } @@ -185,9 +193,17 @@ linux_alloc_kmem(gfp_t flags, unsigned int order) void linux_free_kmem(vm_offset_t addr, unsigned int order) { - size_t size = ((size_t)PAGE_SIZE) << order; + KASSERT((addr & PAGE_MASK) == 0, + ("%s: addr %p is not page aligned", __func__, (void *)addr)); - kmem_free(addr, size); + if (addr >= VM_MIN_KERNEL_ADDRESS && addr < VM_MAX_KERNEL_ADDRESS) { + _linux_free_kmem(addr, order); + } else { + vm_page_t page; + + page = PHYS_TO_VM_PAGE(DMAP_TO_PHYS(addr)); + linux_free_pages(page, order); + } } static int