git: 44691b33cc99 - main - vlrureclaim: only skip vnode with resident pages if it own the pages

Konstantin Belousov kib at FreeBSD.org
Fri Mar 12 11:32:34 UTC 2021


The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=44691b33cc99d0e17262368b6e0f64e531994a23

commit 44691b33cc99d0e17262368b6e0f64e531994a23
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-03-06 21:09:16 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-03-12 11:31:08 +0000

    vlrureclaim: only skip vnode with resident pages if it own the pages
    
    Nullfs vnode which shares vm_object and pages with the lower vnode should
    not be exempt from the reclaim just because lower vnode cached a lot.
    Their reclamation is actually very cheap and should be preferred over
    real fs vnodes, but this change is already useful.
    
    Reported and tested by: pho
    Reviewed by:    mckusick
    Sponsored by:   The FreeBSD Foundation
    MFC after:      2 weeks
    Differential revision:  https://reviews.freebsd.org/D29178
---
 sys/kern/vfs_subr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index c4772f691397..37e713ee48ea 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1169,7 +1169,7 @@ restart:
 		VI_LOCK(vp);
 		if (vp->v_usecount > 0 ||
 		    (!reclaim_nc_src && !LIST_EMPTY(&vp->v_cache_src)) ||
-		    (vp->v_object != NULL &&
+		    (vp->v_object != NULL && vp->v_object->handle == vp &&
 		    vp->v_object->resident_page_count > trigger)) {
 			VOP_UNLOCK(vp);
 			vdropl(vp);


More information about the dev-commits-src-main mailing list