mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-29 21:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmmcache: redo how vnode locking is expected

Browse Source
This commit is contained in:
Matheus
2024-09-18 18:03:07 -03:00
parent 216a2e8d01
commit d5a4f2a4ad
6 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/fs/vfs.c
+22 -6
View File
@@ -228,7 +228,6 @@ static int writenocache(vnode_t *node, page_t *page, uintmax_t pageoffset) {
}
int vfs_write(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t *written, int flags) {
VOP_LOCK(node);
int err = 0;
if (vfs_iscacheable(node)) {
*written = 0;
@@ -242,8 +241,12 @@ int vfs_write(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t
goto leave;
}
MUTEX_ACQUIRE(&node->size_lock, false);
vattr_t attr;
VOP_LOCK(node);
err = VOP_GETATTR(node, &attr, getcred());
VOP_UNLOCK(node);
if (err)
goto leave;
@@ -251,14 +254,18 @@ int vfs_write(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t
if (node->type == V_TYPE_REGULAR && newsize) {
// do resize stuff if regular and applicable
VOP_LOCK(node);
err = VOP_RESIZE(node, newsize, &current_thread()->proc->cred);
VOP_UNLOCK(node);
if (err)
goto leave;
} else if (node->type == V_TYPE_BLKDEV) {
// else just get the disk size and limit the read size
blockdesc_t blockdesc;
int r;
VOP_LOCK(node);
err = VOP_IOCTL(node, BLOCK_IOCTL_GETDESC, &blockdesc, &r, NULL);
VOP_UNLOCK(node);
__assert(err == 0);
size_t bytesize = blockdesc.blockcapacity * blockdesc.blocksize;
@@ -315,18 +322,20 @@ int vfs_write(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t
if (err)
goto leave;
}
leave:
MUTEX_RELEASE(&node->size_lock);
} else {
// special file, just write as its not being cached
VOP_LOCK(node);
err = VOP_WRITE(node, buffer, size, offset, flags, written, getcred());
VOP_UNLOCK(node);
}
leave:
VOP_UNLOCK(node);
return err;
}
int vfs_read(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t *bytesread, int flags) {
VOP_LOCK(node);
int err = 0;
if (vfs_iscacheable(node)) {
*bytesread = 0;
@@ -342,9 +351,12 @@ int vfs_read(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t
size_t nodesize = 0;
MUTEX_ACQUIRE(&node->size_lock, false);
if (node->type == V_TYPE_REGULAR) {
vattr_t attr;
VOP_LOCK(node);
err = VOP_GETATTR(node, &attr, getcred());
VOP_UNLOCK(node);
if (err)
goto leave;
@@ -352,7 +364,9 @@ int vfs_read(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t
} else {
blockdesc_t blockdesc;
int r;
VOP_LOCK(node);
err = VOP_IOCTL(node, BLOCK_IOCTL_GETDESC, &blockdesc, &r, NULL);
VOP_UNLOCK(node);
__assert(err == 0);
nodesize = blockdesc.blockcapacity * blockdesc.blocksize;
@@ -404,12 +418,14 @@ int vfs_read(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t
}
pmm_release(FROM_HHDM(address));
}
leave:
MUTEX_RELEASE(&node->size_lock);
} else {
// special file, just read as size doesn't matter
VOP_LOCK(node);
err = VOP_READ(node, buffer, size, offset, flags, bytesread, getcred());
VOP_UNLOCK(node);
}
leave:
VOP_UNLOCK(node);
return err;
}