Date: Wed, 25 Oct 2023 16:56:42 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: a2c17b534d37 - releng/14.0 - linuxkpi: Fix an assertion in linux_free_kmem() Message-ID: <202310251656.39PGugdt021964@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a2c17b534d37467d51c865a0830d9186b1aa8a98 commit a2c17b534d37467d51c865a0830d9186b1aa8a98 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2023-10-18 13:43:02 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2023-10-25 16:53:08 +0000 linuxkpi: Fix an assertion in linux_free_kmem() In the LinuxKPI, PAGE_MASK is the logical negation of FreeBSD's PAGE_MASK, so the original assertion was simply incorrect. Approved by: re (gjb) Reported by: trasz Tested by: trasz Fixes: 6223d0b67af9 ("linuxkpi: Handle direct-mapped addresses in linux_free_kmem()") (cherry picked from commit f88bd1174aab1aff7fea7241ab6e103e769d2d7a) (cherry picked from commit 501e1152d2a047f8ff8fba6e6efbd2d5e9872738) --- sys/compat/linuxkpi/common/src/linux_page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 21e338acb089..ead2f24cf5df 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -193,7 +193,7 @@ linux_alloc_kmem(gfp_t flags, unsigned int order) void linux_free_kmem(vm_offset_t addr, unsigned int order) { - KASSERT((addr & PAGE_MASK) == 0, + KASSERT((addr & ~PAGE_MASK) == 0, ("%s: addr %p is not page aligned", __func__, (void *)addr)); if (addr >= VM_MIN_KERNEL_ADDRESS && addr < VM_MAX_KERNEL_ADDRESS) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310251656.39PGugdt021964>