KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

vnode io: request range-locking when pgcache reads are enabled

Browse Source 
PR:	272678
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D41334
This commit is contained in:
Konstantin Belousov
2023-08-06 04:23:35 +03:00
parent 651fdc3d19
commit 821dec4d56
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/kern/vfs_vnops.c
+13 -7
View File
@@ -1443,6 +1443,7 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
void *rl_cookie; void *rl_cookie;
struct vn_io_fault_args args; struct vn_io_fault_args args;
int error; int error;
bool do_io_fault, do_rangelock;
doio = uio->uio_rw == UIO_READ ? vn_read : vn_write; doio = uio->uio_rw == UIO_READ ? vn_read : vn_write;
vp = fp->f_vnode; vp = fp->f_vnode;
@@ -1464,13 +1465,10 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
return (EISDIR); return (EISDIR);
} }
do_io_fault = do_vn_io_fault(vp, uio);
do_rangelock = do_io_fault || (vn_irflag_read(vp) & VIRF_PGREAD) != 0;
foffset_lock_uio(fp, uio, flags); foffset_lock_uio(fp, uio, flags);
if (do_vn_io_fault(vp, uio)) { if (do_rangelock) {
args.kind = VN_IO_FAULT_FOP;
args.args.fop_args.fp = fp;
args.args.fop_args.doio = doio;
args.cred = active_cred;
args.flags = flags | FOF_OFFSET;
if (uio->uio_rw == UIO_READ) { if (uio->uio_rw == UIO_READ) {
rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset, rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset,
uio->uio_offset + uio->uio_resid); uio->uio_offset + uio->uio_resid);
@@ -1482,11 +1480,19 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset, rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset,
uio->uio_offset + uio->uio_resid); uio->uio_offset + uio->uio_resid);
} }
}
if (do_io_fault) {
args.kind = VN_IO_FAULT_FOP;
args.args.fop_args.fp = fp;
args.args.fop_args.doio = doio;
args.cred = active_cred;
args.flags = flags | FOF_OFFSET;
error = vn_io_fault1(vp, uio, &args, td); error = vn_io_fault1(vp, uio, &args, td);
vn_rangelock_unlock(vp, rl_cookie);
} else { } else {
error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td); error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td);
} }
if (do_rangelock)
vn_rangelock_unlock(vp, rl_cookie);
foffset_unlock_uio(fp, uio, flags); foffset_unlock_uio(fp, uio, flags);
return (error); return (error);
} }