libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix dfsv2 tmpfs lock fault. (#8027)

Browse Source
This commit is contained in:
geniusgogo 2023-09-13 10:37:00 +08:00 committed by GitHub
parent 6deab5e93d
commit d5b8e2843a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c
View File

@ -120,6 +120,8 @@ int dfs_tmpfs_mount(struct dfs_filesystem *fs,
struct tmpfs_sb *superblock; struct tmpfs_sb *superblock;
superblock = rt_calloc(1, sizeof(struct tmpfs_sb)); superblock = rt_calloc(1, sizeof(struct tmpfs_sb));
if (superblock)
{
superblock->df_size = sizeof(struct tmpfs_sb); superblock->df_size = sizeof(struct tmpfs_sb);
superblock->magic = TMPFS_MAGIC; superblock->magic = TMPFS_MAGIC;
rt_list_init(&superblock->sibling); rt_list_init(&superblock->sibling);
@ -133,6 +135,11 @@ int dfs_tmpfs_mount(struct dfs_filesystem *fs,
rt_spin_lock_init(&superblock->lock); rt_spin_lock_init(&superblock->lock);
fs->data = superblock; fs->data = superblock;
}
else
{
return -1;
}
return RT_EOK; return RT_EOK;
} }

55
components/dfs/dfs_v2/filesystems/tmpfs/dfs_tmpfs.c
View File

@ -86,8 +86,7 @@ static int _free_subdir(struct tmpfs_file *dfile)
{ {
struct tmpfs_file *file; struct tmpfs_file *file;
rt_list_t *list, *temp_list; rt_list_t *list, *temp_list;
struct tmpfs_sb *superblock;
RT_DEFINE_SPINLOCK(lock);
RT_ASSERT(dfile->type == TMPFS_TYPE_DIR); RT_ASSERT(dfile->type == TMPFS_TYPE_DIR);
@ -103,9 +102,14 @@ static int _free_subdir(struct tmpfs_file *dfile)
/* TODO: fix for rt-smart */ /* TODO: fix for rt-smart */
rt_free(file->data); rt_free(file->data);
} }
rt_hw_spin_lock(&lock);
superblock = file->sb;
RT_ASSERT(superblock != NULL);
rt_spin_lock(&superblock->lock);
rt_list_remove(&(file->sibling)); rt_list_remove(&(file->sibling));
rt_hw_spin_unlock(&lock); rt_spin_unlock(&superblock->lock);
rt_free(file); rt_free(file);
} }
return 0; return 0;
@ -130,6 +134,8 @@ static int dfs_tmpfs_mount(struct dfs_mnt *mnt,
rt_list_init(&superblock->root.sibling); rt_list_init(&superblock->root.sibling);
rt_list_init(&superblock->root.subdirs); rt_list_init(&superblock->root.subdirs);
rt_spin_lock_init(&superblock->lock);
mnt->data = superblock; mnt->data = superblock;
} }
else else
@ -137,21 +143,21 @@ static int dfs_tmpfs_mount(struct dfs_mnt *mnt,
return -1; return -1;
} }
return 0; return RT_EOK;
} }
static int dfs_tmpfs_unmount(struct dfs_mnt *mnt) static int dfs_tmpfs_unmount(struct dfs_mnt *mnt)
{ {
struct tmpfs_sb *superblock; struct tmpfs_sb *superblock;
/* FIXME: don't unmount on busy. */
superblock = (struct tmpfs_sb *)mnt->data; superblock = (struct tmpfs_sb *)mnt->data;
RT_ASSERT(superblock != NULL); RT_ASSERT(superblock != NULL);
mnt->data = NULL;
_free_subdir(&(superblock->root)); _free_subdir(&(superblock->root));
rt_free(superblock); rt_free(superblock);
mnt->data = NULL;
return RT_EOK; return RT_EOK;
} }
@ -217,8 +223,6 @@ struct tmpfs_file *dfs_tmpfs_lookup(struct tmpfs_sb *superblock,
struct tmpfs_file *file, *curfile; struct tmpfs_file *file, *curfile;
rt_list_t *list; rt_list_t *list;
RT_DEFINE_SPINLOCK(lock);
subpath = path; subpath = path;
while (*subpath == '/' && *subpath) while (*subpath == '/' && *subpath)
subpath ++; subpath ++;
@ -243,7 +247,7 @@ find_subpath:
memset(subdir_name, 0, TMPFS_NAME_MAX); memset(subdir_name, 0, TMPFS_NAME_MAX);
_get_subdir(curpath, subdir_name); _get_subdir(curpath, subdir_name);
rt_hw_spin_lock(&lock); rt_spin_lock(&superblock->lock);
rt_list_for_each(list, &curfile->subdirs) rt_list_for_each(list, &curfile->subdirs)
{ {
@ -254,7 +258,7 @@ find_subpath:
{ {
*size = file->size; *size = file->size;
rt_hw_spin_unlock(&lock); rt_spin_unlock(&superblock->lock);
return file; return file;
} }
} }
@ -263,11 +267,11 @@ find_subpath:
*size = file->size; *size = file->size;
curpath = subpath; curpath = subpath;
curfile = file; curfile = file;
rt_hw_spin_unlock(&lock); rt_spin_unlock(&superblock->lock);
goto find_subpath; goto find_subpath;
} }
} }
rt_hw_spin_unlock(&lock); rt_spin_unlock(&superblock->lock);
/* not found */ /* not found */
return NULL; return NULL;
} }
@ -315,7 +319,9 @@ static ssize_t dfs_tmpfs_write(struct dfs_file *file, const void *buf, size_t co
return 0; return 0;
} }
rt_spin_lock(&superblock->lock);
superblock->df_size += (*pos - d_file->size + count); superblock->df_size += (*pos - d_file->size + count);
rt_spin_unlock(&superblock->lock);
/* update d_file and file size */ /* update d_file and file size */
d_file->data = ptr; d_file->data = ptr;
d_file->size = *pos + count; d_file->size = *pos + count;
@ -489,8 +495,6 @@ static int dfs_tmpfs_unlink(struct dfs_dentry *dentry)
struct tmpfs_sb *superblock; struct tmpfs_sb *superblock;
struct tmpfs_file *d_file; struct tmpfs_file *d_file;
RT_DEFINE_SPINLOCK(lock);
superblock = (struct tmpfs_sb *)dentry->mnt->data; superblock = (struct tmpfs_sb *)dentry->mnt->data;
RT_ASSERT(superblock != NULL); RT_ASSERT(superblock != NULL);
@ -498,9 +502,9 @@ static int dfs_tmpfs_unlink(struct dfs_dentry *dentry)
if (d_file == NULL) if (d_file == NULL)
return -ENOENT; return -ENOENT;
rt_hw_spin_lock(&lock); rt_spin_lock(&superblock->lock);
rt_list_remove(&(d_file->sibling)); rt_list_remove(&(d_file->sibling));
rt_hw_spin_unlock(&lock); rt_spin_unlock(&superblock->lock);
if (d_file->data != NULL) if (d_file->data != NULL)
rt_free(d_file->data); rt_free(d_file->data);
@ -516,8 +520,6 @@ static int dfs_tmpfs_rename(struct dfs_dentry *old_dentry, struct dfs_dentry *ne
rt_size_t size; rt_size_t size;
char parent_path[DFS_PATH_MAX], file_name[TMPFS_NAME_MAX]; char parent_path[DFS_PATH_MAX], file_name[TMPFS_NAME_MAX];
RT_DEFINE_SPINLOCK(lock);
superblock = (struct tmpfs_sb *)old_dentry->mnt->data; superblock = (struct tmpfs_sb *)old_dentry->mnt->data;
RT_ASSERT(superblock != NULL); RT_ASSERT(superblock != NULL);
@ -537,15 +539,15 @@ static int dfs_tmpfs_rename(struct dfs_dentry *old_dentry, struct dfs_dentry *ne
p_file = dfs_tmpfs_lookup(superblock, parent_path, &size); p_file = dfs_tmpfs_lookup(superblock, parent_path, &size);
RT_ASSERT(p_file != NULL); RT_ASSERT(p_file != NULL);
rt_hw_spin_lock(&lock); rt_spin_lock(&superblock->lock);
rt_list_remove(&(d_file->sibling)); rt_list_remove(&(d_file->sibling));
rt_hw_spin_unlock(&lock); rt_spin_unlock(&superblock->lock);
strncpy(d_file->name, file_name, TMPFS_NAME_MAX); strncpy(d_file->name, file_name, TMPFS_NAME_MAX);
rt_hw_spin_lock(&lock); rt_spin_lock(&superblock->lock);
rt_list_insert_after(&(p_file->subdirs), &(d_file->sibling)); rt_list_insert_after(&(p_file->subdirs), &(d_file->sibling));
rt_hw_spin_unlock(&lock); rt_spin_unlock(&superblock->lock);
return RT_EOK; return RT_EOK;
} }
@ -598,14 +600,13 @@ static struct dfs_vnode *dfs_tmpfs_create_vnode(struct dfs_dentry *dentry, int t
struct tmpfs_file *d_file, *p_file; struct tmpfs_file *d_file, *p_file;
char parent_path[DFS_PATH_MAX], file_name[TMPFS_NAME_MAX]; char parent_path[DFS_PATH_MAX], file_name[TMPFS_NAME_MAX];
RT_DEFINE_SPINLOCK(lock);
if (dentry == NULL || dentry->mnt == NULL || dentry->mnt->data == NULL) if (dentry == NULL || dentry->mnt == NULL || dentry->mnt->data == NULL)
{ {
return NULL; return NULL;
} }
superblock = (struct tmpfs_sb *)dentry->mnt->data; superblock = (struct tmpfs_sb *)dentry->mnt->data;
RT_ASSERT(superblock != NULL);
vnode = dfs_vnode_create(); vnode = dfs_vnode_create();
if (vnode) if (vnode)
@ -655,9 +656,9 @@ static struct dfs_vnode *dfs_tmpfs_create_vnode(struct dfs_dentry *dentry, int t
vnode->mode = S_IFREG | mode; vnode->mode = S_IFREG | mode;
vnode->type = FT_REGULAR; vnode->type = FT_REGULAR;
} }
rt_hw_spin_lock(&lock); rt_spin_lock(&superblock->lock);
rt_list_insert_after(&(p_file->subdirs), &(d_file->sibling)); rt_list_insert_after(&(p_file->subdirs), &(d_file->sibling));
rt_hw_spin_unlock(&lock); rt_spin_unlock(&superblock->lock);
vnode->mnt = dentry->mnt; vnode->mnt = dentry->mnt;
vnode->data = d_file; vnode->data = d_file;

1
components/dfs/dfs_v2/filesystems/tmpfs/dfs_tmpfs.h
View File

@ -39,6 +39,7 @@ struct tmpfs_sb
struct tmpfs_file root; /* root dir */ struct tmpfs_file root; /* root dir */
rt_size_t df_size; /* df size */ rt_size_t df_size; /* df size */
rt_list_t sibling; /* sb sibling list */ rt_list_t sibling; /* sb sibling list */
struct rt_spinlock lock; /* tmpfs lock */
}; };
int dfs_tmpfs_init(void); int dfs_tmpfs_init(void);