From nobody Wed Dec 17 03:53:15 2025 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 4dWKdl3NVzz6Lnwx for ; Wed, 17 Dec 2025 03:53:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dWKdl22nZz3DWN for ; Wed, 17 Dec 2025 03:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765943595; 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=Z5IVgLloLI/YV0PoPWvc9/cgTQ9LHzX3fDQLOBpQLKA=; b=BYYMhWP9eLdFyheyTEZu38gVVkZh+uKVIFVzqY/M2IBl7gN2301qd1ZVG4t0D81lw52iU+ pOTaqFt05sjvTOyigx6Ru+14DpOiTV1tbdIiEpHjZ8wikRYiUI2EWkoUW+39qX4GjM99/t EBIdDj0IWqNWQzR/g+nxdocK4CeW0rGOcJ7BpmTDYToaN4Dv8SP3qOPCOyUTQ03hPss0Rm l95uhAx4sF86PPN7rSAyQm5epfJBlf3vcdJCUtLWN3nFIKyXtHjVb+PXECPLbmKkLm3IBe NjvFXGWgy+JsL2YIgZsC8nymoNyBrjTMKuyRGUOFyrtwy9moBlP166XrXGAmqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765943595; 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=Z5IVgLloLI/YV0PoPWvc9/cgTQ9LHzX3fDQLOBpQLKA=; b=A5fx86kt+aZdjbLG1V7Hcqjh28tgYf+unkTi8HCHvsbvwbAcP1yh85Ie6YkIyDNu8F3r3G qqoA5fn/buFZsaQGUH7/U4FY4eC9M3aQKD2aiA+trgEyOv6PPAoK/x0dBP1pFlrjeZ6Oo2 I5h6n0m+1Cc0+YYiW9MiVZkM4EFoTF4UZCjw0kVlxedqLkBUTiuf4giaxHumL4i2vO7cSw lIXoIvEBASBuGmLLD+GwMnw6ynuArThkPqOU/2bwdd63EX78VOTAMSnJss0iqD9gpxN9ke h7RS21WyiaKA6nja+N4BWNeEwpAeswIxjKqIUY8qmzrKzx6zGjRAH/aLiugrYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765943595; a=rsa-sha256; cv=none; b=OLogzwdVRsmm0Q5HNWLpkxOBuHd60SKQE2RI2j3B0IMVUu5XdvZm0FhZl1vwUzH7dWSUVJ AIIY6/uM7oOK3/8VUXArwtU4Rl0Lz5dFKEmj9H+g6rOQRW4F9FDhUzR9ONUNz9L6v/OeCq LTMEY8d5lrVZAGuAHaQ9FmkeK1kS+lhz+lpOQBCFGOow2UtKEVBS73QXlB/N6dOnE40SA8 DBQO3JDB5wXgjGnOtQg6++QiTw9o9JQqWFDE9gYiLOuQ0fg2eFesrHuPtheS6s34Ljutw9 eIrqnsqtYBnQer0HT66OBCwkVviF3c+Do/cfd/Egp2Rk4kCD+UDBISybc5yQQw== 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 4dWKdl1cndzbmC for ; Wed, 17 Dec 2025 03:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41f7c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 17 Dec 2025 03:53:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 30ae88e3b217 - main - swap_pager_seek_data(): move the clipping at the object size to consumers 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30ae88e3b217b12476dba665d163ab0d8dd6a8a7 Auto-Submitted: auto-generated Date: Wed, 17 Dec 2025 03:53:15 +0000 Message-Id: <6942292b.41f7c.7595a669@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=30ae88e3b217b12476dba665d163ab0d8dd6a8a7 commit 30ae88e3b217b12476dba665d163ab0d8dd6a8a7 Author: Konstantin Belousov AuthorDate: 2025-12-16 05:32:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-17 03:40:31 +0000 swap_pager_seek_data(): move the clipping at the object size to consumers Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54219 --- 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 5082ee1ebdd0..341c88e19115 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); }