Skip to content

vmem: vmem block funcs now able to lazy init devices #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edvardxyz merged 4 commits into from
May 29, 2026
Merged

vmem: vmem block funcs now able to lazy init devices #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c02bf6
vmem: vmem block funcs now able to lazy init devices
edvardxyz May 28, 2026
d485da1
vmem: add dereference on init var
edvardxyz May 28, 2026
31a9d44
vmem: return length 0 if lazy init failed
edvardxyz May 28, 2026
3a1ca86
vmem block: removed vmem_block_init
edvardxyz May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/vmem/vmem_block.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ typedef struct vmem_block_region_s {
extern void vmem_block_read(vmem_t * vmem, uint64_t addr, void * dataout, uint32_t len);
extern void vmem_block_write(vmem_t * vmem, uint64_t addr, const void * datain, uint32_t len);
extern int vmem_block_flush(vmem_t * vmem);
extern void vmem_block_init(void);
void vmem_block_init(void) __attribute__((error("vmem_block_init() has been removed. Block devices now use lazy initialization.")));

#ifdef __cplusplus
}
Expand Down
54 changes: 38 additions & 16 deletions src/vmem/vmem_block.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ static int32_t cache_read(const vmem_block_driver_t *drv, vmem_block_cache_t *ca
static int32_t cache_write(const vmem_block_driver_t *drv, vmem_block_cache_t *cache, uint64_t address, uintptr_t data, uint32_t *length);
static void cache_flush(const vmem_block_driver_t *drv, vmem_block_cache_t *cache);
static bool address_in_cache(const vmem_block_driver_t *drv, vmem_block_cache_t *cache, uint64_t address);
static int32_t _vmem_block_init(const vmem_block_device_t *dev);

static bool address_in_cache(const vmem_block_driver_t *drv, vmem_block_cache_t *cache, uint64_t address) {

Expand All @@ -42,6 +43,13 @@ static bool address_in_cache(const vmem_block_driver_t *drv, vmem_block_cache_t

static void cache_flush(const vmem_block_driver_t *drv, vmem_block_cache_t *cache) {

if(*(drv->device->state) == VMEM_BLOCK_STATE_UNKNOWN) {
int32_t res = _vmem_block_init(drv->device);
if (res < 0) {
return;
}
}

if (cache->is_modified && cache->is_valid) {
int32_t res;
//printf("::cache_flush() The cache is modified, write it to device\n");
Expand All @@ -67,6 +75,15 @@ static int32_t cache_write(const vmem_block_driver_t *drv, vmem_block_cache_t *c
if (data == (uintptr_t)NULL || (*length) == 0) {
return 0;
}

if(*(drv->device->state) == VMEM_BLOCK_STATE_UNKNOWN) {
int32_t res = _vmem_block_init(drv->device);
if (res < 0) {
(*length) = 0;
return 0;
Comment thread
edvardxyz marked this conversation as resolved.
}
}

if (!cache) {
int32_t res;
uint32_t len = 0;
Expand Down Expand Up @@ -163,6 +180,14 @@ static int32_t cache_read(const vmem_block_driver_t *drv, vmem_block_cache_t *ca
return 0;
}

if(*(drv->device->state) == VMEM_BLOCK_STATE_UNKNOWN) {
int32_t res = _vmem_block_init(drv->device);
if (res < 0) {
(*length) = 0;
return 0;
}
}

if (!cache) {
int32_t res;
uint32_t len = 0;
Expand Down Expand Up @@ -333,22 +358,19 @@ int vmem_block_flush(vmem_t * vmem) {
return res;
}

void vmem_block_init(void) {

/* Calling these methods requires that the FreeRTOS scheduler is started, since it uses usleep() */
if ((&__start_vmem_bdevice) && (&__stop_vmem_bdevice)) {
for(vmem_block_device_t *dev = (vmem_block_device_t *)&__start_vmem_bdevice; dev < (vmem_block_device_t *)&__stop_vmem_bdevice; dev++) {
/* Print some specifics for the particular block device */
printf("Initializing VMEM block device: '%s'\n", dev->name);
printf(" block size : %"PRIu32" bytes\n", dev->bsize);
printf(" number of blocks: %"PRIu32"\n", dev->total_nblocks);
printf(" total size : %"PRIu64" bytes\n", ((uint64_t)dev->bsize * (uint64_t)dev->total_nblocks));
/* Then initialize it */
if (dev->init) {
(*dev->init)(dev);
}
}
static int32_t _vmem_block_init(const vmem_block_device_t * dev) {

/* Print some specifics for the particular block device */
int32_t res = -1;
printf("Initializing VMEM block device: '%s'\n", dev->name);
printf(" block size : %" PRIu32 " bytes\n", dev->bsize);
printf(" number of blocks: %" PRIu32 "\n", dev->total_nblocks);
printf(" total size : %" PRIu64 " bytes\n", ((uint64_t)dev->bsize * (uint64_t)dev->total_nblocks));

/* Then initialize it */
if (dev->init) {
res = (*dev->init)(dev);
}

Comment thread
edvardxyz marked this conversation as resolved.
return res;
}
Comment thread
edvardxyz marked this conversation as resolved.

Loading