Date: Wed, 17 Dec 2025 03:53:14 +0000 From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: bdfd695037a9 - main - swap_pager_seek_data(): improve assertions Message-ID: <6942292a.4355d.5d66690d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bdfd695037a95b076aeffd04ed9fdf042b6ce218 commit bdfd695037a95b076aeffd04ed9fdf042b6ce218 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-12-14 09:30:21 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2025-12-17 03:40:31 +0000 swap_pager_seek_data(): improve assertions Check that the passed object indeed has the swap type. Accept any kind of the object lock ownership, not only for read. Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54219 --- sys/vm/swap_pager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 676e585a6b53..5e9a0ad94cb3 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2460,7 +2460,8 @@ swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex) vm_page_t m; vm_pindex_t swap_index; - VM_OBJECT_ASSERT_RLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); + KASSERT((object->flags & OBJ_SWAP) != 0, ("non-swap obj %p", object)); vm_page_iter_init(&pages, object); m = vm_radix_iter_lookup_ge(&pages, pindex); if (m != NULL && pages.index == pindex && vm_page_any_valid(m))help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6942292a.4355d.5d66690d>