From nobody Wed Dec 24 00:42:11 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 4dbY444rHZz6LB5m for ; Wed, 24 Dec 2025 00:42:12 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbY435pgdz3ZM8 for ; Wed, 24 Dec 2025 00:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536931; 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=P0TMW6eh0yathvwOmA908jYbJPE1uRLVkQjIrdZ05EU=; b=jY2jW/yiPtJMVHMBO/+FjEkaaYv4KzZ/QqmQiQCDYnq/nl6+G7dN7xMrUKkWgqd8id3t7B tPyS9ieNfBviaGY1aOzjo/QYCbImcLSd/IgCNB62x+6xfDWPcVuJAmGUbEl5qg7L7dycnG ZyoRBMRXf5NjP4MNdOcLbOOMCrMPUAaH5ioZEjjnqRQLtJD2UOwLsBFTCmq16/JQjVbG9x Ss0evLz+SJUUDzfzlLTo5z5kVA8hy47o9AtUAeFv/8rlSsKZEL+4tFFk+Z0YHlQGv+ChKg IYkqlV7hfOP3t+UKUjOdyVHDz7ZzSNp2QYGfBUyDHSrltqNIhD8urRfw8TzEoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536931; 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=P0TMW6eh0yathvwOmA908jYbJPE1uRLVkQjIrdZ05EU=; b=wQ8NHPFkO7qaMzJe6XDrxYLRM6ZOYYX9xv37WDw7cE9lSuUCA3mBUg5KhX+MkhZv1sYKra xC8JUGhyyr6DK1Fy61Vh7dDadkGttwqV69g3mEgZHs1w0QpbNzcE+4ziLx3ZPHjrKoPCgL 6DHn1Npp2ieiMMXGMP0zckpZIT/3Ewjk/TmWAA65SZerNVnGlh8Rcew6q/tFluW66X0z4n YUj2vBQZkv/H1NgQsEmy/OdzDZlDB1q3kqN6eWwyY1H9UV5LRyMMGJflNyLobB+8cURAol BJc34FiTgJTZ5ErLE41WmTXWBS4szZLjAPbpS2v9dsXv7BBGWpwat0wx7DgNgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766536931; a=rsa-sha256; cv=none; b=k+ZWh7SFWq527SCX7E8tN1uqO+w7Jjr1gs8HU1zHU/px1yDBCYXCZSKRDfzvlse4jMO4jD NJCcbuHaiSL9V1ijyqgv6CMzOHqyt2KFhR71OgfxU4+PmbeXvM16qb+HDk7Huf6kOf2+Kb RB5vVfsummdEI0ooFmsqAUWTErRIuZGunFN4wlPtTcu/0+/NE8uz2n6k7TsNXu5p/RU052 h4akbEP3eCfEw49s2JtI3+/LklswCccS6c6LgvZ2RXsFMTxy6On9DW44uyvrKcHXtHBNSQ zwRB43ym0Qx8SxTxpUMVf+7m9hPChrYoS47p0qSwpN8t3uHNen5uYHhkEBxYMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbY4311qzz3x7 for ; Wed, 24 Dec 2025 00:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31427 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:42:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7dc87eef4695 - stable/15 - swap_pager_seek_data(): move the clipping at the object size to consumers 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7dc87eef4695c93765b598f4558ff5e55bf8bf05 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:42:11 +0000 Message-Id: <694b36e3.31427.36f1cbe5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7dc87eef4695c93765b598f4558ff5e55bf8bf05 commit 7dc87eef4695c93765b598f4558ff5e55bf8bf05 Author: Konstantin Belousov AuthorDate: 2025-12-16 05:32:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:33:00 +0000 swap_pager_seek_data(): move the clipping at the object size to consumers (cherry picked from commit 30ae88e3b217b12476dba665d163ab0d8dd6a8a7) --- sys/fs/tmpfs/tmpfs_vnops.c | 2 ++ sys/vm/swap_pager.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 0f4ea2fdc28c..e1bc0d156baa 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -2091,6 +2091,8 @@ tmpfs_seek_data_locked(vm_object_t obj, off_t noff) vm_pindex_t p; p = swap_pager_seek_data(obj, OFF_TO_IDX(noff)); + if (p == OBJ_MAX_SIZE) + p = obj->size; return (p == OFF_TO_IDX(noff) ? noff : IDX_TO_OFF(p)); } diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 5e9a0ad94cb3..ab95bde34ceb 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2479,8 +2479,6 @@ swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex) return (pages.index); m = vm_radix_iter_step(&pages); } - if (swap_index == OBJ_MAX_SIZE) - swap_index = object->size; return (swap_index); }