sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/spiffs: Fixes yet another SPIFFS/MTD interfacing bug.

Browse Source
This commit is contained in:
Gregory Nutt 2018-09-26 15:16:38 -06:00
parent 63ba200957
commit d59893a456
2 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
fs/spiffs/src/spiffs_core.c
View File

@ -253,8 +253,8 @@ static int spiffs_objlu_find_id_and_span_callback(FAR struct spiffs_s *fs,
pgndx = SPIFFS_OBJ_LOOKUP_ENTRY_TO_PIX(fs, blkndx, entry); pgndx = SPIFFS_OBJ_LOOKUP_ENTRY_TO_PIX(fs, blkndx, entry);
ret = spiffs_cache_read(fs, 0, SPIFFS_OP_T_OBJ_LU2 | SPIFFS_OP_C_READ, ret = spiffs_cache_read(fs, 0, SPIFFS_OP_T_OBJ_LU2 | SPIFFS_OP_C_READ,
SPIFFS_PAGE_TO_PADDR(fs, pgndx), sizeof(struct spiffs_page_header_s), SPIFFS_PAGE_TO_PADDR(fs, pgndx),
(uint8_t *) & ph); sizeof(struct spiffs_page_header_s), (FAR uint8_t *)&ph);
if (ret < 0) if (ret < 0)
{ {
ferr("ERROR: spiffs_cache_read() failed: %d\n", ret); ferr("ERROR: spiffs_cache_read() failed: %d\n", ret);
@ -624,11 +624,16 @@ int spiffs_foreach_objlu(FAR struct spiffs_s *fs, int16_t starting_block,
while (ret >= 0 && while (ret >= 0 &&
obj_lookup_page < (int)SPIFFS_OBJ_LOOKUP_PAGES(fs)) obj_lookup_page < (int)SPIFFS_OBJ_LOOKUP_PAGES(fs))
{ {
int entry_offset = obj_lookup_page * entries_per_page; int entry_offset;
off_t physoff;
entry_offset = obj_lookup_page * entries_per_page;
physoff = cur_block_addr +
SPIFFS_PAGE_TO_PADDR(fs, obj_lookup_page);
ret = spiffs_cache_read(fs, SPIFFS_OP_T_OBJ_LU | SPIFFS_OP_C_READ, ret = spiffs_cache_read(fs, SPIFFS_OP_T_OBJ_LU | SPIFFS_OP_C_READ,
0, cur_block_addr + 0, physoff, SPIFFS_GEO_PAGE_SIZE(fs),
SPIFFS_PAGE_TO_PADDR(fs, obj_lookup_page), fs->lu_work);
SPIFFS_GEO_PAGE_SIZE(fs), fs->lu_work);
/* Check each entry */ /* Check each entry */
@ -652,20 +657,22 @@ int spiffs_foreach_objlu(FAR struct spiffs_s *fs, int16_t starting_block,
if (cb) if (cb)
{ {
ret = cb(fs, ret = cb(fs,
(flags & SPIFFS_VIS_CHECK_PH) ? objid : (flags & SPIFFS_VIS_CHECK_PH) ? objid :
objlu_buf[cur_entry - entry_offset], objlu_buf[cur_entry - entry_offset],
cur_block, cur_entry, user_const, user_var); cur_block, cur_entry, user_const, user_var);
if (ret == SPIFFS_VIS_COUNTINUE || if (ret == SPIFFS_VIS_COUNTINUE ||
ret == SPIFFS_VIS_COUNTINUE_RELOAD) ret == SPIFFS_VIS_COUNTINUE_RELOAD)
{ {
if (ret == SPIFFS_VIS_COUNTINUE_RELOAD) if (ret == SPIFFS_VIS_COUNTINUE_RELOAD)
{ {
physoff = cur_block_addr +
SPIFFS_PAGE_TO_PADDR(fs, obj_lookup_page);
ret = spiffs_cache_read(fs, ret = spiffs_cache_read(fs,
SPIFFS_OP_T_OBJ_LU | SPIFFS_OP_T_OBJ_LU |
SPIFFS_OP_C_READ, 0, SPIFFS_OP_C_READ, 0,
cur_block_addr + physoff,
SPIFFS_PAGE_TO_PADDR(fs, obj_lookup_page),
SPIFFS_GEO_PAGE_SIZE(fs), SPIFFS_GEO_PAGE_SIZE(fs),
fs->lu_work); fs->lu_work);
if (ret < 0) if (ret < 0)
@ -1279,10 +1286,10 @@ int spiffs_page_delete(FAR struct spiffs_s *fs, int16_t pgndx)
#ifdef CONFIG_SPIFFS_NO_BLIND_WRITES #ifdef CONFIG_SPIFFS_NO_BLIND_WRITES
/* Perform read-modify-write operation */ /* Perform read-modify-write operation */
ret = spiffs_cache_read(fs, SPIFFS_OP_T_OBJ_DA | SPIFFS_OP_C_READ, 0, physoff = SPIFFS_PAGE_TO_PADDR(fs, pgndx) +
SPIFFS_PAGE_TO_PADDR(fs, pgndx) + offsetof(struct spiffs_page_header_s, flags)
offsetof(struct spiffs_page_header_s, flags), ret = spiffs_cache_read(fs, SPIFFS_OP_T_OBJ_DA | SPIFFS_OP_C_READ, 0,
sizeof(flags), &flags); physoff, sizeof(flags), &flags);
if (ret < 0) if (ret < 0)
{ {
ferr("ERROR: spiffs_cache_read() failed: %d\n", ret); ferr("ERROR: spiffs_cache_read() failed: %d\n", ret);
@ -1392,7 +1399,7 @@ int spiffs_object_create(FAR struct spiffs_s *fs,
*objhdr_pgndx = SPIFFS_OBJ_LOOKUP_ENTRY_TO_PIX(fs, blkndx, entry); *objhdr_pgndx = SPIFFS_OBJ_LOOKUP_ENTRY_TO_PIX(fs, blkndx, entry);
} }
return ret; return ret < 0 ? ret : OK;
} }
/**************************************************************************** /****************************************************************************
@ -1631,28 +1638,29 @@ int spiffs_object_open_bypage(FAR struct spiffs_s *fs, int16_t pgndx,
uint16_t mode) uint16_t mode)
{ {
struct spiffs_pgobj_ndxheader_s objndx_hdr; struct spiffs_pgobj_ndxheader_s objndx_hdr;
off_t physoff;
int16_t objid; int16_t objid;
int16_t blkndx; int16_t blkndx;
int entry; int entry;
int ret = OK; int ret = OK;
ret = spiffs_cache_read(fs, SPIFFS_OP_T_OBJ_IX | SPIFFS_OP_C_READ, physoff = SPIFFS_PAGE_TO_PADDR(fs, pgndx);
fobj->objid, SPIFFS_PAGE_TO_PADDR(fs, pgndx), ret = spiffs_cache_read(fs, SPIFFS_OP_T_OBJ_IX | SPIFFS_OP_C_READ,
sizeof(struct spiffs_pgobj_ndxheader_s), fobj->objid, physoff,
(FAR uint8_t *)&objndx_hdr); sizeof(struct spiffs_pgobj_ndxheader_s),
(FAR uint8_t *)&objndx_hdr);
if (ret < 0) if (ret < 0)
{ {
ferr("ERROR: spiffs_cache_read() failed: %d\n", ret); ferr("ERROR: spiffs_cache_read() failed: %d\n", ret);
return ret; return ret;
} }
blkndx = SPIFFS_BLOCK_FOR_PAGE(fs, pgndx); blkndx = SPIFFS_BLOCK_FOR_PAGE(fs, pgndx);
entry = SPIFFS_OBJ_LOOKUP_ENTRY_FOR_PAGE(fs, pgndx); entry = SPIFFS_OBJ_LOOKUP_ENTRY_FOR_PAGE(fs, pgndx);
ret = spiffs_cache_read(fs, SPIFFS_OP_T_OBJ_LU | SPIFFS_OP_C_READ, 0, physoff = SPIFFS_BLOCK_TO_PADDR(fs, blkndx) + entry * sizeof(int16_t);
SPIFFS_BLOCK_TO_PADDR(fs, blkndx) + ret = spiffs_cache_read(fs, SPIFFS_OP_T_OBJ_LU | SPIFFS_OP_C_READ, 0,
entry * sizeof(int16_t), sizeof(int16_t), physoff, sizeof(int16_t), (FAR uint8_t *)&objid);
(FAR uint8_t *)&objid);
fobj->objhdr_pgndx = pgndx; fobj->objhdr_pgndx = pgndx;
fobj->size = objndx_hdr.size; fobj->size = objndx_hdr.size;

20
fs/spiffs/src/spiffs_mtd.c
View File

@ -89,6 +89,8 @@ ssize_t spiffs_mtd_write(FAR struct spiffs_s *fs, off_t offset, size_t len,
off_t blkstart; off_t blkstart;
off_t blkend; off_t blkend;
finfo("offset=%ld len=%lu\n", (long)offset, (unsigned long)len);
DEBUGASSERT(fs != NULL && fs->mtd != NULL && src != NULL && len > 0); DEBUGASSERT(fs != NULL && fs->mtd != NULL && src != NULL && len > 0);
remaining = len; remaining = len;
@ -173,6 +175,10 @@ ssize_t spiffs_mtd_write(FAR struct spiffs_s *fs, off_t offset, size_t len,
src += (remaining & ~blkmask); src += (remaining & ~blkmask);
remaining = (remaining & blkmask); remaining = (remaining & blkmask);
/* The real end block is the next block (if remainder > 0) */
blkend++;
} }
/* Check if we need to perform a read-modify-write on the final block. /* Check if we need to perform a read-modify-write on the final block.
@ -182,10 +188,6 @@ ssize_t spiffs_mtd_write(FAR struct spiffs_s *fs, off_t offset, size_t len,
if (remaining > 0) if (remaining > 0)
{ {
/* The real end block is the next block */
blkend++;
#warning "REVISIT: is fs->work available here?" #warning "REVISIT: is fs->work available here?"
ret = MTD_BREAD(fs->mtd, blkend, 1, fs->work); ret = MTD_BREAD(fs->mtd, blkend, 1, fs->work);
if (ret < 0) if (ret < 0)
@ -242,6 +244,8 @@ ssize_t spiffs_mtd_read(FAR struct spiffs_s *fs, off_t offset, size_t len,
off_t blkstart; off_t blkstart;
off_t blkend; off_t blkend;
finfo("offset=%ld len=%lu\n", (long)offset, (unsigned long)len);
DEBUGASSERT(fs != NULL && fs->mtd != NULL && dest != NULL && len > 0); DEBUGASSERT(fs != NULL && fs->mtd != NULL && dest != NULL && len > 0);
remaining = len; remaining = len;
@ -315,6 +319,10 @@ ssize_t spiffs_mtd_read(FAR struct spiffs_s *fs, off_t offset, size_t len,
dest += (remaining & ~blkmask); dest += (remaining & ~blkmask);
remaining = (remaining & blkmask); remaining = (remaining & blkmask);
/* The real end block is the next block (if remainder > 0) */
blkend++;
} }
/* Check if we need to perform a partial read on the final block. /* Check if we need to perform a partial read on the final block.
@ -325,7 +333,7 @@ ssize_t spiffs_mtd_read(FAR struct spiffs_s *fs, off_t offset, size_t len,
if (remaining > 0) if (remaining > 0)
{ {
#warning "REVISIT: is fs->work available here?" #warning "REVISIT: is fs->work available here?"
ret = MTD_BREAD(fs->mtd, blkend + 1, 1, fs->work); ret = MTD_BREAD(fs->mtd, blkend, 1, fs->work);
if (ret < 0) if (ret < 0)
{ {
ferr("ERROR: MTD_BREAD() failed: %d\n", ret); ferr("ERROR: MTD_BREAD() failed: %d\n", ret);
@ -365,6 +373,8 @@ ssize_t spiffs_mtd_erase(FAR struct spiffs_s *fs, off_t offset, size_t len)
off_t eblkend; off_t eblkend;
ssize_t nerased; ssize_t nerased;
finfo("offset=%ld len=%lu\n", (long)offset, (unsigned long)len);
DEBUGASSERT(fs != NULL && fs->mtd != NULL); DEBUGASSERT(fs != NULL && fs->mtd != NULL);
/* We will have to do block read(s) /* We will have to do block read(s)