upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 14:26:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

nfsclient: limit situations when we do unlocked read-ahead by nfsiod

Browse source 
(cherry picked from commit 70dc6b2ce3)
This commit is contained in:
Konstantin Belousov 2024-01-02 00:22:44 +02:00
parent 9e951d6b4b
commit cbf323cf50
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/fs/nfsclient/nfs_clbio.c
View file

@ -484,9 +484,14 @@ ncl_bioread(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred)
on = uio->uio_offset - (lbn * biosize);
/*
* Start the read ahead(s), as required.
* Start the read ahead(s), as required. Do not do
* read-ahead if there are writeable mappings, since
* unlocked read by nfsiod could obliterate changes
* done by userspace.
*/
if (nmp->nm_readahead > 0) {
if (nmp->nm_readahead > 0 &&
!vm_object_mightbedirty(vp->v_object) &&
vp->v_object->un_pager.vnp.writemappings == 0) {
for (nra = 0; nra < nmp->nm_readahead && nra < seqcount &&
(off_t)(lbn + 1 + nra) * biosize < nsize; nra++) {
rabn = lbn + 1 + nra;
@ -674,6 +679,8 @@ ncl_bioread(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred)
*/
NFSLOCKNODE(np);
if (nmp->nm_readahead > 0 &&
!vm_object_mightbedirty(vp->v_object) &&
vp->v_object->un_pager.vnp.writemappings == 0 &&
(bp->b_flags & B_INVAL) == 0 &&
(np->n_direofoffset == 0 ||
(lbn + 1) * NFS_DIRBLKSIZ < np->n_direofoffset) &&