From nobody Thu Jun 19 16:08:36 2025 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 4bNQWm45kCz5yrcb; Thu, 19 Jun 2025 16:08:36 +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 4bNQWm3CtWz3CkP; Thu, 19 Jun 2025 16:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750349316; 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=DodrzF8nRVn4f/u0CysIzAEey90jWlQsKvfM0JR/yKQ=; b=XnJ6G9WyxZ0RlESVwm7/xN5IEHU0JCyORF39e1gwXFTf0EIxIM1Y570Usx6Vmq7PekK8eZ 0w/ZF1PEzJVQZybrUzniUMckqtnx+TOscc+ICUstlHhtFLj2jd9MABJiT7VnHpuLyyEXez watrvuDrDM7l0AFGD+B1EBJpqabhB9bI5bvMBKkDDF8dob9t+0xB0OU+xJhxmUiO1wPkVX yCyNKps03MnSkzBU8wt+yv91Qx+ccmjbAB/1MmFpgKIx4iPAhIVmzR8ciMRomG00DMqat5 MjeCWqqf5a4+ZKdlRcRSDHi1qUm4cqyHjbuN8dOkFM12f5MQvg/0xtcCVsMOng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750349316; 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=DodrzF8nRVn4f/u0CysIzAEey90jWlQsKvfM0JR/yKQ=; b=lWLeBHlAa/Q40KJbZNTNyjWauInRJXzfTdCL2D8SavETKxEmD6wXasNn/KM6L+2NEqey8w nRZYcXnxTH+LktHqUR3Y1bIk+3kBw9SxuTd6tBB5/rToyp/uvM1NB5dbQtDTOECJozr2Kt TcmU5gEd7vBpcvjESYC5VLEAijy4U1qYP2Yr5XPlxHhXlvyZPZ6M7/lFXqkJgtpzAZ3P4R yyA6+HGucdZ76QAu2WtBeOE/0ayqUYCRi8ThnKrEx9HlDcvuZEObnrRxvD8K5AX2OJ0E1O wO5wFKkJikKeKWmL1c96m4zWkxJxHRe2sRY9HtTf1PwcBaAitVPRg7IAzjcb2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750349316; a=rsa-sha256; cv=none; b=K1TcuDvZxPHEDYckznMIUkbqlxcnG2CIC30LYt1JcSjTX2IiBjKu4Clmzi6iivfl6AKT/Z hMsAEvD+b3ZQbRDYN3Tj4u8vJ50RqgIVduzNnhl6jDzdP+XMOZrzXZh/KOBs0zWK1gHYB6 9jfLOYgqgFOLGD5LGcVpJcS8VPEpHJMqenpminwUtJ1xFIAG48bmfq3MVjWU0SpDjR49GP Mgramam9PJN5R4LOZlsP7hIMEolIcxlCv/1KM/ctzSBh5EDuZBlPNq3qw8i4Y7MRrZMfJv AhM/IOlCJIDgFbMpJaxG514I+B5+xqozHL/4CPIo2m5mizY0iGRkP5r0QcG3vA== 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 4bNQWm2Ypxz1Kl9; Thu, 19 Jun 2025 16:08:36 +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 55JG8anZ093458; Thu, 19 Jun 2025 16:08:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55JG8aLw093455; Thu, 19 Jun 2025 16:08:36 GMT (envelope-from git) Date: Thu, 19 Jun 2025 16:08:36 GMT Message-Id: <202506191608.55JG8aLw093455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: c7fe7912a623 - main - vm_page: eliminate a stale KASSERT 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7fe7912a623545c067625e76ae7e540584f37cb Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=c7fe7912a623545c067625e76ae7e540584f37cb commit c7fe7912a623545c067625e76ae7e540584f37cb Author: Alan Cox AuthorDate: 2025-06-19 15:56:42 +0000 Commit: Alan Cox CommitDate: 2025-06-19 16:07:41 +0000 vm_page: eliminate a stale KASSERT With the elimination of VM_ALLOC_NOOBJ, it became illegal to pass VM_ALLOC_WAITOK to vm_page_alloc_contig() (and its helpers). So, there is no point in asserting that the caller didn't pass both VM_ALLOC_NORECLAIM and VM_ALLOC_WAITOK. --- sys/vm/vm_page.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 66aae45cb37e..5b05f0dc11c9 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2327,9 +2327,6 @@ vm_page_alloc_contig_domain(vm_object_t object, vm_pindex_t pindex, int domain, KASSERT(((req & (VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY)) != (VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY)), ("invalid request %#x", req)); - KASSERT((req & (VM_ALLOC_WAITOK | VM_ALLOC_NORECLAIM)) != - (VM_ALLOC_WAITOK | VM_ALLOC_NORECLAIM), - ("invalid request %#x", req)); VM_OBJECT_ASSERT_WLOCKED(object); KASSERT((object->flags & OBJ_FICTITIOUS) == 0, ("vm_page_alloc_contig: object %p has fictitious pages",