From nobody Thu Oct 24 23:04:36 2024 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 4XZM1d0dnYz5Zyh8; Thu, 24 Oct 2024 23:04:37 +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 4XZM1d08TJz4H8J; Thu, 24 Oct 2024 23:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729811077; 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=JBQ6BaMYZsZFEqk8mBhriFxcyaC3D1fype6tqmH2S0c=; b=eXJF8j35PUiLOPDBvxTDXl5T/sitM03DkeLCc4Pw9Q/7eCQfq00ENKZw+5zelfYGBfBKM3 KRr4jQH3atPrPAKeGjEJzeAGPLD5xJL0LmG0tZAx4VFPf7hHi+zsPW93f437DqXDHVkaSr 2ajAcxLIugmOmsq5RY1HuDgOXkhFq0PcKzQiznSqpJpI8H3iLZ36CRGX0KZZWqwGPCpNCK G22e+32vYnBICX5VBVZAHVF8Rz3gdaiOTAoiGATxWSWxn+ZWgf/ZyfFyE+sjGFbPjkTPXM UJVWgY+/xRnTo46ynhpBrHPcYq/KVv/UUzSda5IbblwaWz3fe+fN8ljirCjQBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729811077; 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=JBQ6BaMYZsZFEqk8mBhriFxcyaC3D1fype6tqmH2S0c=; b=mzjIrxEPnx/Zqr8tEWWp+uqyYLwcJKnennHDkXVGvusnr7fAm3M2eiRTJ8scJIYqCtBOBc sHdiB9ySc2sQGVSTLmKUIXCEhqMl9wRhJDnWqe/jfunk2ckL+x2YNBl5aKObxjvAZyB9aV 7nLQjXmkB7Kjv0fZXY9Bf8RqqQczRhaAE9mvtWgQm9JtbNhuIQymCFykoW46N6zLUBORXR 2L/2zhVC7K6dxtqE26PBlCwCvuUf6sN/yyd+B4+eb/lqTiZtbTKT1+8Fum0ydfYAWB4ICG KXd1txoqvJuO/WeQr27aQ+uzKH6/WxdnR72gyPQ5GxJj7X0oACsv6DrGrpXAMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729811077; a=rsa-sha256; cv=none; b=lDCgu5Ox6iWAC36xRNAmx6Jc7SvKZH6FVkjlvv1S5gLVd7tA7OcCPYG343WB3A8qcGWeli OCppPEZjK6V7RrcV8K57mhqXhC2ChWCmhCudPbEN+Uy390oM1PFWrs3+DFOjWN2rlCNEAX Y0vdPKLjPXRHLNF+FT+pJb75nymzdKObOQgY++EWif7MtyvQOTDPDysjgZZcRQ2SWZ42sT raGFlCMwggaVtVUCfY9MIEYnJqrAFckkRomNGqWbRFaRVl3cBloBK1JClbpMfQWykje8uz FmADAB1lqXs0jSDjahr8H0cezTMJUbSUliJgRoXYkr3DhxCXOwfiOYjUwGUuEQ== 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 4XZM1c6rRVz121R; Thu, 24 Oct 2024 23:04: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 49ON4aew047919; Thu, 24 Oct 2024 23:04:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ON4aD7047916; Thu, 24 Oct 2024 23:04:36 GMT (envelope-from git) Date: Thu, 24 Oct 2024 23:04:36 GMT Message-Id: <202410242304.49ON4aD7047916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 02e85d1c8a41 - main - swap_pager: fix assert in seek_data 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02e85d1c8a41cbf6de1899318b25626e62144363 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=02e85d1c8a41cbf6de1899318b25626e62144363 commit 02e85d1c8a41cbf6de1899318b25626e62144363 Author: Doug Moore AuthorDate: 2024-10-24 23:00:47 +0000 Commit: Doug Moore CommitDate: 2024-10-24 23:04:19 +0000 swap_pager: fix assert in seek_data An assertion that an object was write-locked should be instead an assertion that the object is read locked. Reported by: Jenkins Fixes: db08b0b04deced tmpfs_vnops: move swap work to swap_pager Differential Revision: https://reviews.freebsd.org/D47278 --- sys/vm/swap_pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 90d44d3e7402..3d21d42da6c3 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2487,7 +2487,7 @@ swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex) vm_page_t m; vm_pindex_t swap_index; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_RLOCKED(object); vm_page_iter_init(&pages, object); m = vm_page_iter_lookup_ge(&pages, pindex); if (m != NULL) {