Merge pull request #2385 from particle-iot/fix/littlefs-truncate

[Gen 3] LittleFS truncate fix (littlefs-project/littlefs#268)
particle-iot · Dec 23, 2021 · 3cb05eb · 3cb05eb
2 parents 28be875 + 3acd84e
commit 3cb05eb
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 4 deletions.
diff --git a/bootloader/src/nRF52840/nrf_it.c b/bootloader/src/nRF52840/nrf_it.c
@@ -85,7 +85,7 @@ void HardFault_Handler(void)
         " ldr r1, [r0, #24]                                         \n"
         " ldr r2, handler2_address_const                            \n"
         " bx r2                                                     \n"
-        " .align 4                                                  \n"
+        " .balign 4                                                 \n"
         " handler2_address_const: .word prvGetRegistersFromStack    \n"
     );
 }

diff --git a/hal/src/nRF52840/core_hal.c b/hal/src/nRF52840/core_hal.c
@@ -148,7 +148,7 @@ void HardFault_Handler(void) {
         " ldr r1, [r0, #24]                                         \n"
         " ldr r2, handler2_address_const                            \n"
         " bx r2                                                     \n"
-        " .align 4                                                  \n"
+        " .balign 4                                                 \n"
         " handler2_address_const: .word prvGetRegistersFromStack    \n"
     );
 }

diff --git a/hal/src/stm32f2xx/core_hal_stm32f2xx.c b/hal/src/stm32f2xx/core_hal_stm32f2xx.c
@@ -122,7 +122,7 @@ void HardFault_Handler(void)
         " ldr r1, [r0, #24]                                         \n"
         " ldr r2, handler2_address_const                            \n"
         " bx r2                                                     \n"
-        " .align 4                                                  \n"
+        " .balign 4                                                 \n"
         " handler2_address_const: .word prvGetRegistersFromStack    \n"
     );
 }

diff --git a/third_party/littlefs/littlefs b/third_party/littlefs/littlefs
diff --git a/user/tests/wiring/filesystem/posix.cpp b/user/tests/wiring/filesystem/posix.cpp
@@ -494,6 +494,99 @@ test(FS_POSIX_03_Truncate) {
     }
 }
 
+test(FS_POSIX_03_TruncateStress) {
+    // https://github.com/littlefs-project/littlefs/issues/268
+    const int num = 10;
+    const size_t dataSize = 8192;
+    const size_t truncateSize = 8192 / 32;
+
+    auto files = generateRandomFilenames(TEST_DIR, num);
+
+    static char randomData[dataSize] = {};
+    particle::Random rand;
+    rand.gen(randomData, sizeof(randomData));
+
+    spark::Vector<int> fds(num);
+
+    const int iterations = 20;
+
+    for (int iter = 0; iter < iterations; iter++) {
+        Serial.printlnf("iter=%d", iter);
+        // Create and write
+        for (int i = 0; i < num; i++) {
+            int fd = open(files[i], O_CREAT | O_RDWR | O_APPEND);
+            assertMoreOrEqual(fd, 0);
+            fds[i] = fd;
+
+            ssize_t r = write(fd, randomData, sizeof(randomData));
+            assertEqual(r, sizeof(randomData));
+        }
+
+        // Sync
+        for (int i = 0; i < num; i++) {
+            assertEqual(fsync(fds[i]), 0);
+        }
+
+        // Validate file size with stat
+        for (int i = 0; i < num; i++) {
+            struct stat st;
+            assertEqual(0, stat(files[i], &st));
+            assertEqual(st.st_size, sizeof(randomData));
+        }
+
+        ssize_t expectedSize = sizeof(randomData);
+        while (expectedSize > 0) {
+            for (int i = 0; i < num; i++) {
+                // Validate file size with seek
+                assertEqual(expectedSize, lseek(fds[i], 0, SEEK_END));
+                // Validate data
+                char chunk[1024] = {};
+                assertEqual(0, lseek(fds[i], 0, SEEK_SET));
+                for (ssize_t pos = 0; pos < expectedSize; pos += sizeof(chunk)) {
+                    size_t toRead = std::min<size_t>(expectedSize - pos, sizeof(chunk));
+                    Serial.printlnf("[%d] pos=%u/%u toRead=%u", i, pos, expectedSize, toRead);
+                    assertEqual(toRead, read(fds[i], chunk, toRead));
+                    assertEqual(0, memcmp(chunk, randomData + pos, toRead));
+                }
+            }
+
+            expectedSize -= truncateSize;
+            if (expectedSize >= 0) {
+                // ftruncate
+                for (int i = 0; i < num; i++) {
+                    Serial.printlnf("[%d] ftruncate %d", i, expectedSize);
+                    assertEqual(ftruncate(fds[i], expectedSize), 0);
+                }
+            }
+        }
+
+        // Close
+        for (int i = 0; i < num; i++) {
+            assertEqual(close(fds[i]), 0);
+        }
+
+        // Validate file size with stat
+        for (int i = 0; i < num; i++) {
+            struct stat st;
+            assertEqual(0, stat(files[i], &st));
+            assertEqual(st.st_size, 0);
+        }
+
+        // Unlink
+        for (int i = 0; i < num; i++) {
+            assertEqual(0, unlink(files[i]));
+            struct stat st;
+            assertNotEqual(0, stat(files[i], &st));
+        }
+
+        // truncate
+        for (int i = 0; i < num; i++) {
+            assertNotEqual(0, truncate(files[i], 0));
+        }
+    }
+}
+
+
 test(FS_POSIX_99_Cleanup) {
     assertTrue(dirExists(TEST_DIR));
     assertEqual(0, rmDir(TEST_DIR));