Skip to content
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

Add LFS_F_WRUNCHECKED option to avoid validation and hence reading blocks when writing #1056

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add LFS_F_WRUNCHECKED option to avoid validation and hence reading blocks when writing #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56fef76
bd: ensure filebd compiles with assertions
andyp1per Dec 12, 2024
7c83f75
Add LFS_F_WRUNCHECKED option to avoid validation and hence reading bl…
andyp1per Dec 18, 2024
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
1 change: 1 addition & 0 deletions bd/lfs_filebd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ int lfs_filebd_erase(const struct lfs_config *cfg, lfs_block_t block) {

// erase is a noop
(void)block;
(void)bd;

LFS_FILEBD_TRACE("lfs_filebd_erase -> %d", 0);
return 0;
Expand Down
14 changes: 7 additions & 7 deletions lfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ enum {
LFS_CMP_GT = 2,
};


/// Caching block device operations ///

static inline void lfs_cache_drop(lfs_t *lfs, lfs_cache_t *rcache) {
Expand Down Expand Up @@ -2891,7 +2890,7 @@ static int lfs_ctz_find(lfs_t *lfs,
static int lfs_ctz_extend(lfs_t *lfs,
lfs_cache_t *pcache, lfs_cache_t *rcache,
lfs_block_t head, lfs_size_t size,
lfs_block_t *block, lfs_off_t *off) {
lfs_block_t *block, lfs_off_t *off, bool validate) {
while (true) {
// go ahead and grab a block
lfs_block_t nblock;
Expand Down Expand Up @@ -2931,7 +2930,7 @@ static int lfs_ctz_extend(lfs_t *lfs,
}

err = lfs_bd_prog(lfs,
pcache, rcache, true,
pcache, rcache, validate,
nblock, i, &data, 1);
if (err) {
if (err == LFS_ERR_CORRUPT) {
Expand All @@ -2952,7 +2951,7 @@ static int lfs_ctz_extend(lfs_t *lfs,
lfs_block_t nhead = head;
for (lfs_off_t i = 0; i < skips; i++) {
nhead = lfs_tole32(nhead);
err = lfs_bd_prog(lfs, pcache, rcache, true,
err = lfs_bd_prog(lfs, pcache, rcache, validate,
nblock, 4*i, &nhead, 4);
nhead = lfs_fromle32(nhead);
if (err) {
Expand Down Expand Up @@ -3228,6 +3227,7 @@ static int lfs_file_close_(lfs_t *lfs, lfs_file_t *file) {

#ifndef LFS_READONLY
static int lfs_file_relocate(lfs_t *lfs, lfs_file_t *file) {

while (true) {
// just relocate what exists into new block
lfs_block_t nblock;
Expand Down Expand Up @@ -3531,11 +3531,11 @@ static lfs_ssize_t lfs_file_read_(lfs_t *lfs, lfs_file_t *file,
return lfs_file_flushedread(lfs, file, buffer, size);
}


#ifndef LFS_READONLY
static lfs_ssize_t lfs_file_flushedwrite(lfs_t *lfs, lfs_file_t *file,
const void *buffer, lfs_size_t size) {
const uint8_t *data = buffer;
bool validate = !(file->flags & LFS_F_WRUNCHECKED);
lfs_size_t nsize = size;

if ((file->flags & LFS_F_INLINE) &&
Expand Down Expand Up @@ -3571,7 +3571,7 @@ static lfs_ssize_t lfs_file_flushedwrite(lfs_t *lfs, lfs_file_t *file,
lfs_alloc_ckpoint(lfs);
int err = lfs_ctz_extend(lfs, &file->cache, &lfs->rcache,
file->block, file->pos,
&file->block, &file->off);
&file->block, &file->off, validate);
if (err) {
file->flags |= LFS_F_ERRED;
return err;
Expand All @@ -3587,7 +3587,7 @@ static lfs_ssize_t lfs_file_flushedwrite(lfs_t *lfs, lfs_file_t *file,
// program as much as we can in current block
lfs_size_t diff = lfs_min(nsize, lfs->cfg->block_size - file->off);
while (true) {
int err = lfs_bd_prog(lfs, &file->cache, &lfs->rcache, true,
int err = lfs_bd_prog(lfs, &file->cache, &lfs->rcache, validate,
file->block, file->off, data, diff);
if (err) {
if (err == LFS_ERR_CORRUPT) {
Expand Down
3 changes: 3 additions & 0 deletions lfs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ enum lfs_open_flags {
LFS_F_ERRED = 0x080000, // An error occurred during write
#endif
LFS_F_INLINE = 0x100000, // Currently inlined in directory entry
#ifndef LFS_READONLY
LFS_F_WRUNCHECKED = 0x200000, // blindly write without validating the data
#endif
};

// File seek flags
Expand Down
Loading