Fixed read cache amount based on hint and offset

Found by apmorton
Fixed migration test condition for prefix branches
2025-11-01 16:14:13 +01:00 · 2019-05-21 17:21:52 -05:00 · 2019-04-16 18:29:44 -05:00 · 2019-04-16 17:59:28 -05:00 · 2019-04-12 15:21:25 -05:00 · 2019-04-12 08:44:00 -05:00
3 changed files with 15 additions and 21 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -136,10 +136,11 @@ jobs:
      env:
        - STAGE=test
        - NAME=littlefs-migration
+      if: branch !~ -prefix$
      install:
        - sudo apt-get install libfuse-dev
        - git clone --depth 1 https://github.com/geky/littlefs-fuse -b v2-alpha v2
-        - git clone --depth 1 https://github.com/geky/littlefs-fuse v1
+        - git clone --depth 1 https://github.com/geky/littlefs-fuse -b v1 v1
        - fusermount -V
        - gcc --version
      before_script:
--- a/lfs.c
+++ b/lfs.c
@@ -29,7 +29,7 @@ static inline void lfs_cache_drop(lfs_t *lfs, lfs_cache_t *rcache) {

 static inline void lfs_cache_zero(lfs_t *lfs, lfs_cache_t *pcache) {
    // zero to avoid information leak
-    memset(pcache->buffer, 0xff, lfs->cfg->prog_size);
+    memset(pcache->buffer, 0xff, lfs->cfg->cache_size);
    pcache->block = 0xffffffff;
 }

@@ -80,28 +80,16 @@ static int lfs_bd_read(lfs_t *lfs,
            diff = lfs_min(diff, rcache->off-off);
        }

-        if (size >= hint && off % lfs->cfg->read_size == 0 &&
-                size >= lfs->cfg->read_size) {
-            // bypass cache?
-            diff = lfs_aligndown(diff, lfs->cfg->read_size);
-            int err = lfs->cfg->read(lfs->cfg, block, off, data, diff);
-            if (err) {
-                return err;
-            }
-
-            data += diff;
-            off += diff;
-            size -= diff;
-            continue;
-        }
-
        // load to cache, first condition can no longer fail
        LFS_ASSERT(block < lfs->cfg->block_count);
        rcache->block = block;
        rcache->off = lfs_aligndown(off, lfs->cfg->read_size);
-        rcache->size = lfs_min(lfs_alignup(off+hint, lfs->cfg->read_size),
-                lfs_min(lfs->cfg->block_size - rcache->off,
-                    lfs->cfg->cache_size));
+        rcache->size = lfs_min(
+                lfs_min(
+                    lfs_alignup(off+hint, lfs->cfg->read_size),
+                    lfs->cfg->block_size)
+                - rcache->off,
+                lfs->cfg->cache_size);
        int err = lfs->cfg->read(lfs->cfg, rcache->block,
                rcache->off, rcache->buffer, rcache->size);
        if (err) {
@@ -2864,6 +2852,10 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
        return LFS_ERR_BADF;
    }

+    if (size > LFS_FILE_MAX) {
+        return LFS_ERR_INVAL;
+    }
+
    lfs_off_t oldsize = lfs_file_size(lfs, file);
    if (size < oldsize) {
        // need to flush since directly changing metadata
--- a/lfs.h
+++ b/lfs.h
@@ -578,7 +578,8 @@ int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir);
 // Read an entry in the directory
 //
 // Fills out the info structure, based on the specified file or directory.
-// Returns a negative error code on failure.
+// Returns a positive value on success, 0 at the end of directory,
+// or a negative error code on failure.
 int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);

 // Change the position of the directory
Author	SHA1	Message	Date
Christopher Haster	c64bf1a17b	Fixed read cache amount based on hint and offset Found by apmorton	2019-05-21 17:21:52 -05:00
Christopher Haster	f35fb8c148	Fixed migration test condition for prefix branches Both the littlefs-fuse and littlefs-migration test jobs depend on the external littlefs-fuse repo. But unfortunately, the automatic patching to update the external repo with the version under test does not work with the prefix branches. In this case we can just skip these tests, they've already been tested multiple times to get to this point.	2019-04-16 18:29:44 -05:00
Christopher Haster	0a1f706ca2	Merge pull request #160 from FreddieChopin/no-cache-bypass Don't bypass cache in `lfs_cache_prog()` and `lfs_cache_read()`	2019-04-16 17:59:28 -05:00
Freddie Chopin	fdd239fe21	Don't bypass cache in `lfs_cache_prog()` and `lfs_cache_read()` In some cases specific alignment of buffer passed to underlying device is required. For example SDMMC in STM32F7 (when used with DMA) requires the buffers to be aligned to 16 bytes. If you enable data cache in STM32F7, the alignment of buffer passed to any driver which uses DMA should generally be at least 32 bytes. While it is possible to provide sufficiently aligned "read", "prog" and per-file caches to littlefs, the cases where caches are bypassed are hard to control when littlefs is hidden under some additional layers. For example if you couple littlefs with stdio and use it via `FILE`, then littlefs functions will operate on internal `FIlE` buffer, usually allocated dynamically, so in these specific cases - with insufficient alignment (8 bytes on ARM Cortex-M). The easy path was taken - remove all cases of cache bypassing. Fixes #158	2019-04-12 15:21:25 -05:00
Christopher Haster	780ef2fce4	Fixed buffer overflow due to mistaking prog_size for cache_size found by ajaybhargav	2019-04-12 08:44:00 -05:00
Christopher Haster	73ea008b74	Merge pull request #151 from Krakonos/master Fixed documentation for return lfs_dir_read return value.	2019-04-12 17:07:25 -05:00
Christopher Haster	c849748453	Merge pull request #150 from ajaybhargav/truncate-fix Fix: length more than LFS_FILE_MAX should return error	2019-04-12 17:06:58 -05:00
Christopher Haster	25a843aab7	Fixed .travis.yml to use explicit branch names for migration testing This lets us actually update the littlefs-fuse repo instead of being bound to master for v1.	2019-04-12 15:13:00 -05:00
Ajay Bhargav	905727b684	Fix: length more than LFS_FILE_MAX should return error To make lfs_file_truncate inline with ftruncate function, when -ve or size more than maximum file size is passed to function it should return invalid parameter error. In LFS case LFS_ERR_INVAL. Signed-off-by: Ajay Bhargav <contact@rickeyworld.info>	2019-04-12 15:09:44 -05:00
Ladislav Láska	26d25608b6	Fixed documentation for return lfs_dir_read return value. lfs_dir_read breaks the convention of returning non-zero on success, this feature should be at least documented.	2019-03-01 10:01:02 +01:00