KVFS improvements
This commit is contained in:
@ -1,9 +1,10 @@
|
|||||||
#ifndef ERRORS_H_
|
#ifndef ERRORS_H_
|
||||||
#define ERRORS_H_
|
#define ERRORS_H_
|
||||||
|
|
||||||
#define E_OK 0
|
#define E_OK 0
|
||||||
#define E_NOMEMORY -1
|
#define E_NOMEMORY -1
|
||||||
#define E_UNKNOWN_FSTYPE -2
|
#define E_UNKNOWN_FSTYPE -2
|
||||||
#define E_NOENTRY -3
|
#define E_NOENTRY -3
|
||||||
|
#define E_OUTOFBOUNDS -4
|
||||||
|
|
||||||
#endif // ERRORS_H_
|
#endif // ERRORS_H_
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include "dlmalloc/malloc.h"
|
#include "dlmalloc/malloc.h"
|
||||||
#include "util/util.h"
|
#include "util/util.h"
|
||||||
|
|
||||||
int32_t kvfs_read(struct VfsMountPoint *vmp, const char *key, uint8_t *const buffer, size_t n) {
|
int32_t kvfs_read(struct VfsMountPoint *vmp, const char *key, uint8_t *const buffer, size_t n, size_t off) {
|
||||||
KvfsNode *node = NULL;
|
KvfsNode *node = NULL;
|
||||||
|
|
||||||
spinlock_acquire(&vmp->spinlock);
|
spinlock_acquire(&vmp->spinlock);
|
||||||
@ -22,12 +22,12 @@ int32_t kvfs_read(struct VfsMountPoint *vmp, const char *key, uint8_t *const buf
|
|||||||
}
|
}
|
||||||
|
|
||||||
spinlock_acquire(&node->spinlock);
|
spinlock_acquire(&node->spinlock);
|
||||||
hal_memcpy(buffer, node->buffer, MIN(n, KVFS_BUFFER_SIZE));
|
hal_memcpy(buffer + off, node->buffer, MIN(n, KVFS_BUFFER_SIZE - off));
|
||||||
spinlock_release(&node->spinlock);
|
spinlock_release(&node->spinlock);
|
||||||
return E_OK;
|
return E_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t kvfs_write(struct VfsMountPoint *vmp, const char *key, const uint8_t *const buffer, size_t n) {
|
int32_t kvfs_write(struct VfsMountPoint *vmp, const char *key, const uint8_t *const buffer, size_t n, size_t off) {
|
||||||
KvfsNode *node = NULL;
|
KvfsNode *node = NULL;
|
||||||
|
|
||||||
spinlock_acquire(&vmp->spinlock);
|
spinlock_acquire(&vmp->spinlock);
|
||||||
@ -42,13 +42,15 @@ int32_t kvfs_write(struct VfsMountPoint *vmp, const char *key, const uint8_t *co
|
|||||||
spinlock_release(&vmp->spinlock);
|
spinlock_release(&vmp->spinlock);
|
||||||
|
|
||||||
spinlock_acquire(&node->spinlock);
|
spinlock_acquire(&node->spinlock);
|
||||||
node->buffer = dlmalloc(KVFS_BUFFER_SIZE);
|
|
||||||
if (node->buffer == NULL) {
|
if (node->buffer == NULL) {
|
||||||
spinlock_release(&node->spinlock);
|
node->buffer = dlmalloc(KVFS_BUFFER_SIZE);
|
||||||
return E_NOMEMORY;
|
if (node->buffer == NULL) {
|
||||||
|
spinlock_release(&node->spinlock);
|
||||||
|
return E_NOMEMORY;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hal_memcpy(node->buffer, buffer, MIN(n, KVFS_BUFFER_SIZE));
|
hal_memcpy(node->buffer + off, buffer, MIN(n, KVFS_BUFFER_SIZE - off));
|
||||||
spinlock_release(&node->spinlock);
|
spinlock_release(&node->spinlock);
|
||||||
return E_OK;
|
return E_OK;
|
||||||
}
|
}
|
||||||
@ -65,26 +67,41 @@ int32_t kvfs_remove(struct VfsMountPoint *vmp, const char *key) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
spinlock_acquire(&node->spinlock);
|
spinlock_acquire(&node->spinlock);
|
||||||
|
if (node->buffer != NULL) {
|
||||||
|
dlfree(node->buffer);
|
||||||
|
}
|
||||||
hal_memset(node, 0, sizeof(*node));
|
hal_memset(node, 0, sizeof(*node));
|
||||||
spinlock_release(&node->spinlock);
|
spinlock_release(&node->spinlock);
|
||||||
return E_OK;
|
return E_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int32_t kvfs_cleanup(struct VfsMountPoint *vmp) {
|
||||||
|
for (size_t i = 0; i < KVFS_NODES_MAX; i++) {
|
||||||
|
KvfsNode *node = &vmp->fs.kvfs.nodes[i];
|
||||||
|
spinlock_acquire(&node->spinlock);
|
||||||
|
if (node->buffer != NULL) {
|
||||||
|
dlfree(node->buffer);
|
||||||
|
}
|
||||||
|
spinlock_release(&node->spinlock);
|
||||||
|
}
|
||||||
|
return E_OK;
|
||||||
|
}
|
||||||
|
|
||||||
bool kvfs_check(void) {
|
bool kvfs_check(void) {
|
||||||
int32_t ret;
|
int32_t ret;
|
||||||
|
|
||||||
char *hello = "WAWAWAWA!!!";
|
char *hello = "WAWAWAWA!!!";
|
||||||
ret = vfs_write("+tmpvars", "hello", hello, hal_strlen(hello)+1);
|
ret = vfs_write("tmpvars", "hello", hello, hal_strlen(hello)+1, 0);
|
||||||
if (ret != E_OK) return false;
|
if (ret != E_OK) return false;
|
||||||
|
|
||||||
char buf[20];
|
char buf[20];
|
||||||
ret = vfs_read("+tmpvars", "hello", buf, sizeof(buf));
|
ret = vfs_read("tmpvars", "hello", buf, sizeof(buf), 0);
|
||||||
if (ret != E_OK) return false;
|
if (ret != E_OK) return false;
|
||||||
|
|
||||||
vfs_remove("+tmpvars", "hello");
|
vfs_remove("tmpvars", "hello");
|
||||||
if (ret != E_OK) return false;
|
if (ret != E_OK) return false;
|
||||||
|
|
||||||
ret = vfs_read("+tmpvars", "hello", buf, sizeof(buf));
|
ret = vfs_read("tmpvars", "hello", buf, sizeof(buf), 0);
|
||||||
if (ret != E_NOENTRY) return false;
|
if (ret != E_NOENTRY) return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -20,9 +20,10 @@ typedef struct {
|
|||||||
KvfsNode nodes[KVFS_NODES_MAX];
|
KvfsNode nodes[KVFS_NODES_MAX];
|
||||||
} Kvfs;
|
} Kvfs;
|
||||||
|
|
||||||
int32_t kvfs_read(struct VfsMountPoint *vmp, const char *key, uint8_t *const buffer, size_t n);
|
int32_t kvfs_read(struct VfsMountPoint *vmp, const char *key, uint8_t *const buffer, size_t n, size_t off);
|
||||||
int32_t kvfs_write(struct VfsMountPoint *vmp, const char *key, const uint8_t *const buffer, size_t n);
|
int32_t kvfs_write(struct VfsMountPoint *vmp, const char *key, const uint8_t *const buffer, size_t n, size_t off);
|
||||||
int32_t kvfs_remove(struct VfsMountPoint *vmp, const char *key);
|
int32_t kvfs_remove(struct VfsMountPoint *vmp, const char *key);
|
||||||
|
int32_t kvfs_cleanup(struct VfsMountPoint *vmp);
|
||||||
bool kvfs_check(void);
|
bool kvfs_check(void);
|
||||||
|
|
||||||
#endif // FS_KVFS_KVFS_H_
|
#endif // FS_KVFS_KVFS_H_
|
||||||
|
@ -14,7 +14,7 @@ VfsTable VFS_TABLE;
|
|||||||
|
|
||||||
static const char *vfs_strings[] = {
|
static const char *vfs_strings[] = {
|
||||||
[VFS_FATFS] = "FAT",
|
[VFS_FATFS] = "FAT",
|
||||||
[VFS_KVFS] = "Kvfs",
|
[VFS_KVFS] = "KVFS",
|
||||||
};
|
};
|
||||||
|
|
||||||
void vfs_init_kvfs(VfsMountPoint *mp) {
|
void vfs_init_kvfs(VfsMountPoint *mp) {
|
||||||
@ -22,6 +22,7 @@ void vfs_init_kvfs(VfsMountPoint *mp) {
|
|||||||
mp->write = &kvfs_write;
|
mp->write = &kvfs_write;
|
||||||
mp->remove = &kvfs_remove;
|
mp->remove = &kvfs_remove;
|
||||||
mp->check = &kvfs_check;
|
mp->check = &kvfs_check;
|
||||||
|
mp->cleanup = &kvfs_cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t vfs_mount(char *mountpoint, int32_t fstype) {
|
int32_t vfs_mount(char *mountpoint, int32_t fstype) {
|
||||||
@ -48,7 +49,7 @@ int32_t vfs_mount(char *mountpoint, int32_t fstype) {
|
|||||||
return E_OK;
|
return E_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t vfs_read(char *mountpoint, const char *path, uint8_t *const buffer, size_t n) {
|
int32_t vfs_unmount(char *mountpoint) {
|
||||||
VfsMountPoint *mp = NULL;
|
VfsMountPoint *mp = NULL;
|
||||||
|
|
||||||
spinlock_acquire(&VFS_TABLE.spinlock);
|
spinlock_acquire(&VFS_TABLE.spinlock);
|
||||||
@ -59,10 +60,18 @@ int32_t vfs_read(char *mountpoint, const char *path, uint8_t *const buffer, size
|
|||||||
return E_NOENTRY;
|
return E_NOENTRY;
|
||||||
}
|
}
|
||||||
|
|
||||||
return mp->read(mp, path, buffer, n);
|
spinlock_acquire(&mp->spinlock);
|
||||||
|
int32_t err = mp->cleanup(mp);
|
||||||
|
if (err != E_OK) {
|
||||||
|
spinlock_release(&mp->spinlock);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
hal_memset(mp, 0, sizeof(*mp));
|
||||||
|
spinlock_release(&mp->spinlock);
|
||||||
|
return E_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t vfs_write(char *mountpoint, const char *path, const uint8_t *const buffer, size_t n) {
|
int32_t vfs_read(char *mountpoint, const char *path, uint8_t *const buffer, size_t n, size_t off) {
|
||||||
VfsMountPoint *mp = NULL;
|
VfsMountPoint *mp = NULL;
|
||||||
|
|
||||||
spinlock_acquire(&VFS_TABLE.spinlock);
|
spinlock_acquire(&VFS_TABLE.spinlock);
|
||||||
@ -73,7 +82,21 @@ int32_t vfs_write(char *mountpoint, const char *path, const uint8_t *const buffe
|
|||||||
return E_NOENTRY;
|
return E_NOENTRY;
|
||||||
}
|
}
|
||||||
|
|
||||||
return mp->write(mp, path, buffer, n);
|
return mp->read(mp, path, buffer, n, off);
|
||||||
|
}
|
||||||
|
|
||||||
|
int32_t vfs_write(char *mountpoint, const char *path, const uint8_t *const buffer, size_t n, size_t off) {
|
||||||
|
VfsMountPoint *mp = NULL;
|
||||||
|
|
||||||
|
spinlock_acquire(&VFS_TABLE.spinlock);
|
||||||
|
HSHTB_GET(&VFS_TABLE, mountpoints, mountpoint, label, mp);
|
||||||
|
spinlock_release(&VFS_TABLE.spinlock);
|
||||||
|
|
||||||
|
if (mp == NULL) {
|
||||||
|
return E_NOENTRY;
|
||||||
|
}
|
||||||
|
|
||||||
|
return mp->write(mp, path, buffer, n, off);
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t vfs_remove(char *mountpoint, const char *path) {
|
int32_t vfs_remove(char *mountpoint, const char *path) {
|
||||||
@ -94,7 +117,7 @@ void vfs_init(void) {
|
|||||||
hal_memset(&VFS_TABLE, 0, sizeof(VFS_TABLE));
|
hal_memset(&VFS_TABLE, 0, sizeof(VFS_TABLE));
|
||||||
spinlock_init(&VFS_TABLE.spinlock);
|
spinlock_init(&VFS_TABLE.spinlock);
|
||||||
|
|
||||||
ASSERT("vfs", vfs_mount("+tmpvars", VFS_KVFS) == E_OK, "could not create +tmpvars mount point\n");
|
ASSERT("vfs", vfs_mount("tmpvars", VFS_KVFS) == E_OK, "could not create tmpvars mount point\n");
|
||||||
|
|
||||||
LOG("vfs", "init done\n");
|
LOG("vfs", "init done\n");
|
||||||
|
|
||||||
@ -102,7 +125,11 @@ void vfs_init(void) {
|
|||||||
if (!VFS_TABLE.mountpoints[i].taken) continue;
|
if (!VFS_TABLE.mountpoints[i].taken) continue;
|
||||||
VfsMountPoint *vmp = &VFS_TABLE.mountpoints[i];
|
VfsMountPoint *vmp = &VFS_TABLE.mountpoints[i];
|
||||||
LOG("vfs", "mount point %s: %s\n", vmp->label, vfs_strings[vmp->fstype]);
|
LOG("vfs", "mount point %s: %s\n", vmp->label, vfs_strings[vmp->fstype]);
|
||||||
LOG("vfs", "check = %s\n", vmp->check() ? "OK" : "FAIL");
|
if (vmp->check != NULL) {
|
||||||
|
LOG("vfs", "check = %s\n", vmp->check() ? "OK" : "FAIL");
|
||||||
|
} else {
|
||||||
|
LOG("vfs", "check skipped\n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,9 +20,10 @@ typedef struct VfsMountPoint {
|
|||||||
uint8_t label[VFS_MOUNTPOINT_LABEL_MAX];
|
uint8_t label[VFS_MOUNTPOINT_LABEL_MAX];
|
||||||
int32_t fstype;
|
int32_t fstype;
|
||||||
|
|
||||||
int32_t (*read)(struct VfsMountPoint *vmp, const char *path, uint8_t *const buffer, size_t n);
|
int32_t (*read)(struct VfsMountPoint *vmp, const char *path, uint8_t *const buffer, size_t n, size_t off);
|
||||||
int32_t (*write)(struct VfsMountPoint *vmp, const char *path, const uint8_t *const buffer, size_t n);
|
int32_t (*write)(struct VfsMountPoint *vmp, const char *path, const uint8_t *const buffer, size_t n, size_t off);
|
||||||
int32_t (*remove)(struct VfsMountPoint *vmp, const char *path);
|
int32_t (*remove)(struct VfsMountPoint *vmp, const char *path);
|
||||||
|
int32_t (*cleanup)(struct VfsMountPoint *vmp);
|
||||||
bool (*check)(void);
|
bool (*check)(void);
|
||||||
|
|
||||||
union {
|
union {
|
||||||
@ -39,8 +40,9 @@ typedef struct {
|
|||||||
extern VfsTable VFS_TABLE;
|
extern VfsTable VFS_TABLE;
|
||||||
|
|
||||||
void vfs_init(void);
|
void vfs_init(void);
|
||||||
int32_t vfs_read(char *mountpoint, const char *path, uint8_t *const buffer, size_t n);
|
int32_t vfs_read(char *mountpoint, const char *path, uint8_t *const buffer, size_t n, size_t off);
|
||||||
int32_t vfs_write(char *mountpoint, const char *path, const uint8_t *const buffer, size_t n);
|
int32_t vfs_write(char *mountpoint, const char *path, const uint8_t *const buffer, size_t n, size_t off);
|
||||||
int32_t vfs_remove(char *mountpoint, const char *path);
|
int32_t vfs_remove(char *mountpoint, const char *path);
|
||||||
|
int32_t vfs_unmount(char *mountpoint);
|
||||||
|
|
||||||
#endif // VFS_VFS_H_
|
#endif // VFS_VFS_H_
|
||||||
|
Reference in New Issue
Block a user