From nobody Wed Oct 18 13:45:04 2023 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 4S9XCj0MQHz4x3NX; Wed, 18 Oct 2023 13:45:05 +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 4S9XCh6GhCz3CXc; Wed, 18 Oct 2023 13:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697636704; 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=yDYgZV+TEkm5/EFDuHYWPFkNwlD+BxLgxTvPixbAloM=; b=UVh1Q48gpG+gg8NCV5MVpo9pZ3S122k8q6SeJUxg7jpNifuWkZgGKxDXkoXzDft+oYukbR d8VrWcnMfKDXDLbK7zdFPLEASQyP2T7JrAb46QNj/vWyG061N55GomFRprC+J4Oy+801lS SXv8Uh86RJYiIIKqZYQmw06I6uEKvyRBaWx7V4MryKJfvSuiSabslBwlLgQXolOn/GAcwj CNKuywNwVhWvpkFtX4oXZ4V3Z4aKxbCLDbH5Y1gwRQGAO4be8El4zqN3jgPzU8k6kpM8NS vqx7kHs8KMd62gkCa2CzjVQgx/hTnpcWSX6SBM+t9+ZfQPRCrx5dOJTb63ni5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697636704; a=rsa-sha256; cv=none; b=rCK8vF41aiGYLE2zxhupGsZAKSa3YI2YZblYVzQLzq56tmG/40B5GZOCB4fZwsRDASAKHY wB8ju4v4grsVLrKdyyG4MicW4GEj9jy2jnK42BoTMeMercIMO8yHu7RXWOCG07fxTwnkXP UmIfA6G2hYY/ZqjdukRi+7Ut47iG/6+VMnXTLdeCOs45yVc0hY0VMF8xmxVzrVqCvQHS4Q /0Wh5HA9vWP+ocwft7AZX6CvYRMl7WBGpC/+/YOzH180nW70CyiLc6HB1OxpQV2c2Et7xP 1tq3I1OzwWWJnbRyrB7JGNP+0wY7032oZBETMH5ibKfIZOBA6a3oxTeeqV/ZHQ== 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=1697636704; 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=yDYgZV+TEkm5/EFDuHYWPFkNwlD+BxLgxTvPixbAloM=; b=grNU+D4CRMI4SUiSe/SWYpoU8WoAtbCLc4DrPrE9JahJTP39zCBru8tc1Fzg0Xt7WNXvH2 oP5K56H57u2mZdw6bBJkA8rXePKRnBFEr8qwXzbSDg5qr/3qJSWZVZLvaadI5J+wwxZFwL 8wyrwAGXNROz8WQGcG5z4g2PwfrS65FJWW1mKSu1PjP+FQ2hNe5efjqsqokD+mJdXfzYc/ XkfSozInE9kkxPBz6krFogD1gfW/oF2I03BVCg/93j1VscY7z4qflKKB3ArtlmIN0br2Qy FqX7MtQBNDDzkkUUIuL6SfZImwG+g+M9/96Kl+1rJELIzD49RBL44a8qOPQDig== 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 4S9XCh5Fp4z17Yx; Wed, 18 Oct 2023 13:45:04 +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 39IDj4LF006693; Wed, 18 Oct 2023 13:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IDj4ej006690; Wed, 18 Oct 2023 13:45:04 GMT (envelope-from git) Date: Wed, 18 Oct 2023 13:45:04 GMT Message-Id: <202310181345.39IDj4ej006690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f88bd1174aab - main - linuxkpi: Fix an assertion 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/main X-Git-Reftype: branch X-Git-Commit: f88bd1174aab1aff7fea7241ab6e103e769d2d7a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f88bd1174aab1aff7fea7241ab6e103e769d2d7a commit f88bd1174aab1aff7fea7241ab6e103e769d2d7a Author: Mark Johnston AuthorDate: 2023-10-18 13:43:02 +0000 Commit: Mark Johnston CommitDate: 2023-10-18 13:43:02 +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. Reported by: trasz Tested by: trasz Fixes: 6223d0b67af9 ("linuxkpi: Handle direct-mapped addresses in linux_free_kmem()") --- 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) {