mirror of
https://git.openafs.org/openafs.git
synced 2025-01-31 05:27:44 +00:00
STABLE14101-linux-mmap-antirecursion-fix-20090512
LICENSE IPL10 FIXES 124627 fix the mmap anti-recursion protection to set and mask CPageWrite appropriately and with the correct lock protection. this leaves us with an issue to handle when the mmap'd file is larger (possibly considerably larger) than the cache (cherry picked from commit 5e0e1ea2540d0cb7d7274350eb1fadfd41733ea4)
This commit is contained in:
parent
a6403c0134
commit
3ef285cb11
@ -102,9 +102,7 @@ osi_VM_StoreAllSegments(struct vcache *avc)
|
|||||||
{
|
{
|
||||||
struct inode *ip = AFSTOV(avc);
|
struct inode *ip = AFSTOV(avc);
|
||||||
|
|
||||||
if (!avc->states & CPageWrite)
|
if (avc->states & CPageWrite)
|
||||||
avc->states |= CPageWrite;
|
|
||||||
else
|
|
||||||
return; /* someone already writing */
|
return; /* someone already writing */
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,5)
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,5)
|
||||||
@ -120,7 +118,6 @@ osi_VM_StoreAllSegments(struct vcache *avc)
|
|||||||
AFS_GLOCK();
|
AFS_GLOCK();
|
||||||
ObtainWriteLock(&avc->lock, 121);
|
ObtainWriteLock(&avc->lock, 121);
|
||||||
#endif
|
#endif
|
||||||
avc->states &= ~CPageWrite;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Purge VM for a file when its callback is revoked.
|
/* Purge VM for a file when its callback is revoked.
|
||||||
|
@ -1567,9 +1567,9 @@ afs_linux_writepage_sync(struct inode *ip, struct page *pp,
|
|||||||
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
|
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
|
||||||
ICL_TYPE_INT32, 99999);
|
ICL_TYPE_INT32, 99999);
|
||||||
|
|
||||||
ObtainReadLock(&vcp->lock);
|
ObtainWriteLock(&vcp->lock, 532);
|
||||||
if (vcp->states & CPageWrite) {
|
if (vcp->states & CPageWrite) {
|
||||||
ReleaseReadLock(&vcp->lock);
|
ReleaseWriteLock(&vcp->lock);
|
||||||
AFS_GUNLOCK();
|
AFS_GUNLOCK();
|
||||||
unlock_kernel();
|
unlock_kernel();
|
||||||
crfree(credp);
|
crfree(credp);
|
||||||
@ -1585,7 +1585,8 @@ afs_linux_writepage_sync(struct inode *ip, struct page *pp,
|
|||||||
return(0);
|
return(0);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
ReleaseReadLock(&vcp->lock);
|
vcp->states |= CPageWrite;
|
||||||
|
ReleaseWriteLock(&vcp->lock);
|
||||||
|
|
||||||
setup_uio(&tuio, &iovec, buffer, base, count, UIO_WRITE, AFS_UIOSYS);
|
setup_uio(&tuio, &iovec, buffer, base, count, UIO_WRITE, AFS_UIOSYS);
|
||||||
|
|
||||||
@ -1594,16 +1595,18 @@ afs_linux_writepage_sync(struct inode *ip, struct page *pp,
|
|||||||
i_size_write(ip, vcp->m.Length);
|
i_size_write(ip, vcp->m.Length);
|
||||||
ip->i_blocks = ((vcp->m.Length + 1023) >> 10) << 1;
|
ip->i_blocks = ((vcp->m.Length + 1023) >> 10) << 1;
|
||||||
|
|
||||||
|
ObtainWriteLock(&vcp->lock, 533);
|
||||||
if (!code) {
|
if (!code) {
|
||||||
struct vrequest treq;
|
struct vrequest treq;
|
||||||
|
|
||||||
ObtainWriteLock(&vcp->lock, 533);
|
|
||||||
if (!afs_InitReq(&treq, credp))
|
if (!afs_InitReq(&treq, credp))
|
||||||
code = afs_DoPartialWrite(vcp, &treq);
|
code = afs_DoPartialWrite(vcp, &treq);
|
||||||
ReleaseWriteLock(&vcp->lock);
|
|
||||||
}
|
}
|
||||||
code = code ? -code : count - tuio.uio_resid;
|
code = code ? -code : count - tuio.uio_resid;
|
||||||
|
|
||||||
|
vcp->states &= ~CPageWrite;
|
||||||
|
ReleaseWriteLock(&vcp->lock);
|
||||||
|
|
||||||
afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
|
afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
|
||||||
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
|
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
|
||||||
ICL_TYPE_INT32, code);
|
ICL_TYPE_INT32, code);
|
||||||
@ -1658,6 +1661,11 @@ afs_linux_writepage(struct page *pp)
|
|||||||
do_it:
|
do_it:
|
||||||
status = afs_linux_writepage_sync(inode, pp, 0, offset);
|
status = afs_linux_writepage_sync(inode, pp, 0, offset);
|
||||||
SetPageUptodate(pp);
|
SetPageUptodate(pp);
|
||||||
|
#if defined(WRITEPAGE_ACTIVATE)
|
||||||
|
if ( status != WRITEPAGE_ACTIVATE )
|
||||||
|
#else
|
||||||
|
if ( status != AOP_WRITEPAGE_ACTIVATE )
|
||||||
|
#endif
|
||||||
UnlockPage(pp);
|
UnlockPage(pp);
|
||||||
if (status == offset)
|
if (status == offset)
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user