Add checkpoint & restore 49/261949/1
authorMateusz Moscicki <m.moscicki2@partner.samsung.com>
Tue, 29 Jun 2021 12:05:47 +0000 (14:05 +0200)
committerMateusz Moscicki <m.moscicki2@partner.samsung.com>
Thu, 29 Jul 2021 10:37:14 +0000 (12:37 +0200)
To protect the system upgrade process in case of power failure, the
checkpoint & restore mechanism is used.

Algorithm:

  1. If there is any checkpoint on partition, the data is restored,
     because it means the previous upgrade attempt failed.
  2. When mounting a partition, a data checkpoint is created.
  3. The update is proceeding as before.
  4. If the update is successful, the data is commited.

Change-Id: I26dac82c629d7d71b31a3dafcc5b8e8b6887c8d2

CMakeLists.txt
bow-restore/CMakeLists.txt [new file with mode: 0644]
bow-restore/bow-restore.cpp [new file with mode: 0644]
packaging/initrd-fota.spec
scripts/40-fota.list.in
scripts/fota-init.sh
scripts/fus_rw-init.sh

index e4a948b47d8f298697f124454c66eb6185739cbc..f581db00094badd63e332a953e92ff834fa0d18a 100644 (file)
@@ -1,6 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(initrd-fota)
 
+ADD_SUBDIRECTORY(bow-restore)
+
 CONFIGURE_FILE(${INITRD_FOTA_SCRIPTS_DIR}/40-fota.list.in
                                ${INITRD_FOTA_SCRIPTS_DIR}/40-fota.list
-                               @ONLY)
\ No newline at end of file
+                               @ONLY)
diff --git a/bow-restore/CMakeLists.txt b/bow-restore/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9a12d98
--- /dev/null
@@ -0,0 +1,13 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(bow-restore)
+
+set (CMAKE_CXX_STANDARD 17)
+
+SET(SRCS bow-restore.cpp)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Werror -O2")
+
+ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -pie)
+
+INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME} DESTINATION sbin)
diff --git a/bow-restore/bow-restore.cpp b/bow-restore/bow-restore.cpp
new file mode 100644 (file)
index 0000000..a0226ee
--- /dev/null
@@ -0,0 +1,415 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <map>
+#include <string>
+#include <unistd.h>
+#include <mutex>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+enum log_level {
+    INFO,
+    ERROR
+};
+
+#define LOG(X) std::cout
+
+class Status {
+private:
+    int _status;
+    std::string _msg;
+public:
+    Status(int value, const std::string &msg) : _status(value), _msg(msg) { }
+    static Status ok() {
+        Status st = {0, ""};
+        return st;
+    }
+
+    static Status error(int value, const std::string &message) {
+        Status st = {value, message};
+        return st;
+    }
+
+    static Status error(const std::string &message) {
+        Status st = {-1, message};
+        return st;
+    }
+
+    static Status error(const char *message) {
+        Status st = {-1, message};
+        return st;
+    }
+
+    std::string &message() { return _msg; };
+
+    bool isOk() { return _status == 0; }
+};
+
+Status error(int value, const std::string &message) {
+    return Status::error(value, message);
+}
+
+Status error(const std::string &message) {
+    return Status::error(message);
+}
+
+// END
+
+const int kSectorSize = 512;
+
+typedef uint64_t sector_t;
+
+struct log_entry {
+    sector_t source;  // in sectors of size kSectorSize
+    sector_t dest;    // in sectors of size kSectorSize
+    uint32_t size;    // in bytes
+    uint32_t checksum;
+} __attribute__((packed));
+
+struct log_sector_v1_0 {
+    uint32_t magic;
+    uint16_t header_version;
+    uint16_t header_size;
+    uint32_t block_size;
+    uint32_t count;
+    uint32_t sequence;
+    uint64_t sector0;
+} __attribute__((packed));
+
+// MAGIC is BOW in ascii
+const int kMagic = 0x00574f42;
+// Partially restored MAGIC is WOB in ascii
+const int kPartialRestoreMagic = 0x00424f57;
+
+void crc32(const void* data, size_t n_bytes, uint32_t* crc) {
+    static uint32_t table[0x100] = {
+        0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535,
+        0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD,
+        0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D,
+        0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+        0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4,
+        0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
+        0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC,
+        0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+        0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB,
+        0xB6662D3D,
+
+        0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5,
+        0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
+        0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED,
+        0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+        0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074,
+        0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC,
+        0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C,
+        0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+        0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B,
+        0xC0BA6CAD,
+
+        0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615,
+        0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D,
+        0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D,
+        0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+        0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4,
+        0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C,
+        0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C,
+        0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+        0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B,
+        0x5BDEAE1D,
+
+        0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785,
+        0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D,
+        0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD,
+        0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+        0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354,
+        0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
+        0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C,
+        0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+        0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B,
+        0x2D02EF8D};
+
+    for (size_t i = 0; i < n_bytes; ++i) {
+        *crc ^= ((uint8_t*)data)[i];
+        *crc = table[(uint8_t)*crc] ^ *crc >> 8;
+    }
+}
+
+// A map of relocations.
+// The map must be initialized so that relocations[0] = 0
+// During restore, we replay the log records in reverse, copying from dest to
+// source
+// To validate, we must be able to read the 'dest' sectors as though they had
+// been copied but without actually copying. This map represents how the sectors
+// would have been moved. To read a sector s, find the index <= s and read
+// relocations[index] + s - index
+typedef std::map<sector_t, sector_t> Relocations;
+
+void relocate(Relocations& relocations, sector_t dest, sector_t source, int count) {
+    // Find first one we're equal to or greater than
+    auto s = --relocations.upper_bound(source);
+
+    // Take slice
+    Relocations slice;
+    slice[dest] = source - s->first + s->second;
+    ++s;
+
+    // Add rest of elements
+    for (; s != relocations.end() && s->first < source + count; ++s)
+        slice[dest - source + s->first] = s->second;
+
+    // Split range at end of dest
+    auto dest_end = --relocations.upper_bound(dest + count);
+    relocations[dest + count] = dest + count - dest_end->first + dest_end->second;
+
+    // Remove all elements in [dest, dest + count)
+    relocations.erase(relocations.lower_bound(dest), relocations.lower_bound(dest + count));
+
+    // Add new elements
+    relocations.insert(slice.begin(), slice.end());
+}
+
+// A map of sectors that have been written to.
+// The final entry must always be False.
+// When we restart the restore after an interruption, we must take care that
+// when we copy from dest to source, that the block we copy to was not
+// previously copied from.
+// i e. A->B C->A; If we replay this sequence, we end up copying C->B
+// We must save our partial result whenever we finish a page, or when we copy
+// to a location that was copied from earlier (our source is an earlier dest)
+typedef std::map<sector_t, bool> Used_Sectors;
+
+bool checkCollision(Used_Sectors& used_sectors, sector_t start, sector_t end) {
+    auto second_overlap = used_sectors.upper_bound(start);
+    auto first_overlap = --second_overlap;
+
+    if (first_overlap->second) {
+        return true;
+    } else if (second_overlap != used_sectors.end() && second_overlap->first < end) {
+        return true;
+    }
+    return false;
+}
+
+void markUsed(Used_Sectors& used_sectors, sector_t start, sector_t end) {
+    auto start_pos = used_sectors.insert_or_assign(start, true).first;
+    auto end_pos = used_sectors.insert_or_assign(end, false).first;
+
+    if (start_pos == used_sectors.begin() || !std::prev(start_pos)->second) {
+        start_pos++;
+    }
+    if (std::next(end_pos) != used_sectors.end() && !std::next(end_pos)->second) {
+        end_pos++;
+    }
+    if (start_pos->first < end_pos->first) {
+        used_sectors.erase(start_pos, end_pos);
+    }
+}
+
+// Restores the given log_entry's data from dest -> source
+// If that entry is a log sector, set the magic to kPartialRestoreMagic and flush.
+void restoreSector(int device_fd, Used_Sectors& used_sectors, std::vector<char>& ls_buffer,
+                   log_entry* le, std::vector<char>& buffer) {
+    log_sector_v1_0& ls = *reinterpret_cast<log_sector_v1_0*>(&ls_buffer[0]);
+    uint32_t index = le - ((log_entry*)&ls_buffer[ls.header_size]);
+    int count = (le->size - 1) / kSectorSize + 1;
+
+    if (checkCollision(used_sectors, le->source, le->source + count)) {
+        fsync(device_fd);
+        lseek64(device_fd, 0, SEEK_SET);
+        ls.count = index + 1;
+        ls.magic = kPartialRestoreMagic;
+        if (write(device_fd, &ls_buffer[0], ls.block_size) == -1)
+        LOG(ERROR) << "write error\n";
+        fsync(device_fd);
+        used_sectors.clear();
+        used_sectors[0] = false;
+    }
+
+    markUsed(used_sectors, le->dest, le->dest + count);
+
+    if (index == 0 && ls.sequence != 0) {
+        log_sector_v1_0* next = reinterpret_cast<log_sector_v1_0*>(&buffer[0]);
+        if (next->magic == kMagic) {
+            next->magic = kPartialRestoreMagic;
+        }
+    }
+
+    lseek64(device_fd, le->source * kSectorSize, SEEK_SET);
+    if (write(device_fd, &buffer[0], le->size) == -1)
+        LOG(ERROR) << "write error\n";
+
+    if (index == 0) {
+        fsync(device_fd);
+    }
+}
+
+// Read from the device
+// If we are validating, the read occurs as though the relocations had happened
+std::vector<char> relocatedRead(int device_fd, Relocations const& relocations, bool validating,
+                                sector_t sector, uint32_t size, uint32_t block_size) {
+    if (!validating) {
+        std::vector<char> buffer(size);
+        lseek64(device_fd, sector * kSectorSize, SEEK_SET);
+        if (read(device_fd, &buffer[0], size) == -1)
+        LOG(ERROR) << "read error\n";
+        return buffer;
+    }
+
+    std::vector<char> buffer(size);
+    for (uint32_t i = 0; i < size; i += block_size, sector += block_size / kSectorSize) {
+        auto relocation = --relocations.upper_bound(sector);
+        lseek64(device_fd, (sector + relocation->second - relocation->first) * kSectorSize,
+                SEEK_SET);
+        if (read(device_fd, &buffer[i], block_size) == -1)
+        LOG(ERROR) << "read error\n";
+    }
+
+    return buffer;
+}
+
+
+Status cp_restoreCheckpoint(const std::string& blockDevice, int restore_limit) {
+    bool validating = true;
+    std::string action = "Validating";
+    int restore_count = 0;
+
+    for (;;) {
+        Relocations relocations;
+        relocations[0] = 0;
+        Status status = Status::ok();
+
+        LOG(INFO) << action << " checkpoint on " << blockDevice << "\n";
+        int device_fd = open(blockDevice.c_str(), O_RDWR | O_CLOEXEC);
+        if (device_fd < 0) return error("Cannot open " + blockDevice);
+
+        log_sector_v1_0 original_ls;
+        if (read(device_fd, reinterpret_cast<char*>(&original_ls), sizeof(original_ls)) == -1)
+        LOG(ERROR) << "read error\n";
+        if (original_ls.magic == kPartialRestoreMagic) {
+            validating = false;
+            action = "Restoring";
+        } else if (original_ls.magic != kMagic) {
+            return error(EINVAL, "No magic");
+        }
+
+        LOG(INFO) << action << " " << original_ls.sequence << " log sectors" << "\n";
+
+        for (int sequence = original_ls.sequence; sequence >= 0 && status.isOk(); sequence--) {
+            auto ls_buffer = relocatedRead(device_fd, relocations, validating, 0,
+                                           original_ls.block_size, original_ls.block_size);
+            log_sector_v1_0& ls = *reinterpret_cast<log_sector_v1_0*>(&ls_buffer[0]);
+
+            Used_Sectors used_sectors;
+            used_sectors[0] = false;
+
+            if (ls.magic != kMagic && (ls.magic != kPartialRestoreMagic || validating)) {
+                status = error(EINVAL, "No magic");
+                break;
+            }
+
+            if (ls.block_size != original_ls.block_size) {
+                status = error(EINVAL, "Block size mismatch");
+                break;
+            }
+
+            if ((int)ls.sequence != sequence) {
+                status = error(EINVAL, "Expecting log sector " + std::to_string(sequence) +
+                                           " but got " + std::to_string(ls.sequence));
+                break;
+            }
+
+            LOG(INFO) << action << " from log sector " << ls.sequence << "\n";
+            for (log_entry* le =
+                     reinterpret_cast<log_entry*>(&ls_buffer[ls.header_size]) + ls.count - 1;
+                 le >= reinterpret_cast<log_entry*>(&ls_buffer[ls.header_size]); --le) {
+                // This is very noisy - limit to DEBUG only
+                // std::cout << "Validating:  " << validating << " restore_count: " << restore_count << "\n";
+                // LOG(VERBOSE) << action << " " << le->size << " bytes from sector " << le->dest
+                //              << " to " << le->source << " with checksum " << std::hex
+                //              << le->checksum << "\n";
+
+                auto buffer = relocatedRead(device_fd, relocations, validating, le->dest, le->size,
+                                            ls.block_size);
+                /*
+                uint32_t checksum = le->source / (ls.block_size / kSectorSize);
+                for (size_t i = 0; i < le->size; i += ls.block_size) {
+                    crc32(&buffer[i], ls.block_size, &checksum);
+                }
+
+
+                if (le->checksum && checksum != le->checksum) {
+                    status = error(EINVAL, "Checksums don't match");
+                    break;
+                }
+                */
+
+                if (validating) {
+                    relocate(relocations, le->source, le->dest, (le->size - 1) / kSectorSize + 1);
+                } else {
+                    restoreSector(device_fd, used_sectors, ls_buffer, le, buffer);
+                    restore_count++;
+                    if (restore_limit && restore_count >= restore_limit) {
+                        status = error(EAGAIN, "Hit the test limit");
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (!status.isOk()) {
+            if (!validating) {
+                LOG(ERROR) << "Checkpoint restore failed even though checkpoint validation passed" << "\n";
+                return status;
+            }
+
+            LOG(WARNING) << "Checkpoint validation failed - attempting to roll forward" << "\n";
+            auto buffer = relocatedRead(device_fd, relocations, false, original_ls.sector0,
+                                        original_ls.block_size, original_ls.block_size);
+            lseek64(device_fd, 0, SEEK_SET);
+            if (write(device_fd, &buffer[0], original_ls.block_size) == -1)
+            LOG(ERROR) << "write error\n";
+            return Status::ok();
+        }
+
+        if (!validating) break;
+
+        validating = false;
+        action = "Restoring";
+    }
+
+    return Status::ok();
+}
+
+int main(int argc, char *argv[]) {
+    if (argc != 2) {
+        std::cout << "\nUsage:\n";
+        std::cout << argv[0] << " <device>\n";
+        return EXIT_FAILURE;
+    }
+    std::string blockDevice(argv[1]);
+
+    Status status = cp_restoreCheckpoint(blockDevice, 0);
+    if (!status.isOk()) {
+        LOG(ERROR) << "bow-restore error: " << status.message() << "\n";
+        return EXIT_FAILURE;
+    }
+    return EXIT_SUCCESS;
+}
index c4f5f931ccf3c83014c7d60cbbe2495195e02fd4..a99fb916bc320d7e04eb3594c2c5549812daaa35 100755 (executable)
@@ -14,6 +14,7 @@ Requires: bash
 Requires: procps
 Requires: dbus-libs
 Requires: initrd-recovery
+Requires: device-mapper
 
 %description
 package for building partition image for RAMDISK2 (ramdisk-recovery.img)
@@ -28,6 +29,8 @@ package for building partition image for RAMDISK2 (ramdisk-recovery.img)
        -DINITRD_FOTA_SCRIPTS_DIR=scripts
 
 %install
+rm -rf %{buildroot}
+%make_install
 
 %define init_script_dir %{_libdir}/initrd-recovery/fota
 
@@ -46,3 +49,4 @@ cp ./scripts/40-fota.list %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d
 %attr(700,root,root) %{init_script_dir}/*.sh
 %attr(700,root,root) %{_datadir}/initrd-recovery/initrd.list.d/*.list
 %attr(777,system,system) /opt/data/update
+%attr(700,root,root) %{_sbindir}/bow-restore
index fb67a276cd8c4860047b7ff95dd21045c48802f2..346170cfa6c8477146bd28a19dabab6a16f6ce95 100755 (executable)
@@ -31,6 +31,12 @@ WITHLIBS="
 /bin/verityctl
 /bin/verity_handler
 /usr/sbin/agetty
+/usr/bin/readlink
+/usr/bin/tail
+/usr/bin/stat
+/usr/sbin/dmsetup
+/usr/sbin/bow-restore
+/usr/sbin/fstrim
 "
 
 # LinkFileName:Target
index d70b2616948b8bcd093a311ff0450d36a6bf43a1..96228825c29b9e191e7e909e7da23f623a7aead2 100755 (executable)
@@ -35,6 +35,11 @@ WC="/usr/bin/wc"
 LS="/bin/ls"
 VERITYCTL="/usr/bin/verityctl"
 VERITY_HANDLER="/usr/bin/verity_handler"
+BOW_RESTORE="bow-restore"
+
+DMSETUP="dmsetup"
+FSTRIM="fstrim"
+STAT="stat"
 
 FOTA_GUI="/usr/bin/fota_gui"
 FOTA_GUI_ENABLE=
@@ -43,6 +48,7 @@ SYSTEM_DATA_MNT=opt
 USER_MNT=opt/usr
 
 SCRIPT_NAME="fota-init.sh"
+UPGRADE_SUCCESS=0
 #------------------------------------------------
 #       log msg [file]
 #------------------------------------------------
@@ -64,17 +70,129 @@ get_partition_id() {
        PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device || "$BLKID" --match-token LABEL=user -o device)
 }
 
+#------------------------------------------------
+#       restore_checkpoint
+#------------------------------------------------
+restore_checkpoint() {
+       # Any existing checkpoint means that the RW update was unexpectedly
+       # aborded, so we must roll back the changes and update again.
+       log "[Debug] Bow restore" "${INT_LOG_FILE}"
+       PART="${1}"
+
+       if [ "$(blkid -o value -s TYPE ${PART})" = "ext4" ]; then
+               "$BOW_RESTORE" "${PART}"
+       fi
+}
+
+mount_bow_partition() {
+       LABEL=${1}
+       PARTITION=${2}
+       DIRECTORY=${3}
+       BOWDEV_NAME=bowdev_${LABEL}
+       BOWDEV_PATH=/dev/mapper/${BOWDEV_NAME}
+       SECTORS=$(</sys/class/block/$(lsblk -no NAME ${PARTITION})/size)
+
+       if ! "${DMSETUP}" create "${BOWDEV_NAME}" --table "0 ${SECTORS} bow ${PARTITION}" ; then
+               log "[Error] Cannot create ${BOWDEV_NAME}"
+               return 1
+       fi
+
+       if ! "${MOUNT}" "${BOWDEV_PATH}" "${DIRECTORY}" ; then
+               log "[Error] Cannot mount ${BOWDEV_PATH} into ${DIRECTORY}"
+               return 1
+       fi
+
+       "${FSTRIM}" -v "${DIRECTORY}"
+
+       DM_NUMBER=$(($("${STAT}" -c "0x%T" $(readlink -f "${BOWDEV_PATH}"))))
+       echo 1 > /sys/block/dm-${DM_NUMBER}/bow/state
+       log "[Debug] Mounted ${PARTITION} as DM-BOW" "${INT_LOG_FILE}"
+}
+
+mount_f2fs_partition() {
+       LABEL=${1}
+       PARTITION=${2}
+       DIRECTORY=${3}
+       if ! "${MOUNT}" -o checkpoint=disable "${PARTITION}" "${DIRECTORY}" ; then
+               log "[Error] Cannot mount ${PARTITION} into ${DIRECTORY}"
+               return 1
+       fi
+       log "[Debug] Mounted ${PARTITION} as F2FS checkpoint=disable" "${INT_LOG_FILE}"
+}
+
+mount_checkpoint_partition() {
+       LABEL=${1}
+       PARTITION=${2}
+       DIRECTORY=${3}
+       FSTYPE=$(lsblk -o FSTYPE -n "${PARTITION}")
+
+       if [ "${FSTYPE}" = "ext4" ]; then
+               if ! mount_bow_partition "${LABEL}" "${PARTITION}" "${DIRECTORY}" ; then
+                       return 1
+               fi
+       elif [ "${FSTYPE}" = "f2fs" ]; then
+               if ! mount_f2fs_partition "${LABEL}" "${PARTITION}" "${DIRECTORY}" ; then
+                       return 1
+               fi
+       else
+               "${MOUNT}" "${PARTITION}" "${DIRECTORY}"
+               log "[Info] Unsupported filesystem ${FSTYPE} on ${PARTITION}" "${INT_LOG_FILE}"
+       fi
+}
+
+commit_bow_partition()
+{
+       LABEL=${1}
+
+       BOWDEV_NAME=bowdev_${LABEL}
+       BOWDEV_PATH=/dev/mapper/${BOWDEV_NAME}
+       DM_NUMBER=$(($("${STAT}" -c "0x%T" $(readlink -f "${BOWDEV_PATH}"))))
+       echo 2 > /sys/block/dm-${DM_NUMBER}/bow/state
+       log "[Info] Changes on partition ${LABEL} commited (dm-bow)" "${INT_LOG_FILE}"
+}
+
+commit_f2fs_partition()
+{
+       LABEL=${1}
+       PART_SYSTEM_DATA=$(blkid --match-token PARTLABEL="${LABEL}" -o device || blkid --match-token LABEL="${LABEL}" -o device)
+       "${MOUNT}" -o remount,checkpoint=enable "${PART_SYSTEM_DATA}"
+       log "[Info] Changes on partition ${LABEL} commited (f2fs)" "${INT_LOG_FILE}"
+}
+
+commit_partition()
+{
+       LABEL=${1}
+       TYPE=$(blkid --match-token LABEL="${LABEL}" -o value -s TYPE | tail -n 1)
+       if [ "${TYPE}" = "ext4" ]; then
+               commit_bow_partition "${LABEL}"
+       elif [ "${TYPE}" = "f2fs" ]; then
+               commit_f2fs_partition "${LABEL}"
+       else
+               log "[Info] Cannot commit ${LABEL}: Unsupported filesystem ${TYPE}" "${INT_LOG_FILE}"
+       fi
+}
+
 #------------------------------------------------
 #       mount_partitions
 #------------------------------------------------
 mount_partitions() {
        get_partition_id
 
-       "$MOUNT" -o ro "${PART_ROOTFS}" "${FAKE_ROOT}"
-       "$MOUNT" "${PART_SYSTEM_DATA}" "${FAKE_ROOT}/${SYSTEM_DATA_MNT}"
+       restore_checkpoint "${PART_ROOTFS}"
+       if ! mount_checkpoint_partition rootfs "${PART_ROOTFS}" "${FAKE_ROOT}" ; then
+               return 1
+       fi
+
+       restore_checkpoint "${PART_SYSTEM_DATA}"
+       if ! mount_checkpoint_partition system-data "${PART_SYSTEM_DATA}" "${FAKE_ROOT}/${SYSTEM_DATA_MNT}" ; then
+               return 1
+       fi
 
        if [ ! "z${PART_USER}" = "z" ]; then
-               "$MOUNT" "${PART_USER}" "${FAKE_ROOT}/${USER_MNT}"
+               restore_checkpoint "${PART_USER}"
+               if ! mount_checkpoint_partition user "${PART_USER}" "${FAKE_ROOT}/${USER_MNT}" ; then
+                       return 1
+               fi
        fi
 
        "$MOUNT" -t proc none "${FAKE_ROOT}/proc"
@@ -83,6 +201,30 @@ mount_partitions() {
        "$MOUNT" -t devpts devpts "${FAKE_ROOT}/dev/pts"
 }
 
+umount_bow_partition()
+{
+       LABEL=${1}
+       PART=${2}
+
+       "$UMOUNT" "${PART}"
+
+       BOWDEV_NAME=bowdev_${LABEL}
+       "${DMSETUP}" remove ${BOWDEV_NAME}
+}
+
+umount_partition()
+{
+       LABEL=${1}
+       DIRECTORY=${2}
+
+       TYPE=$(blkid --match-token LABEL="${LABEL}" -o value -s TYPE | tail -n 1)
+       if [ "${TYPE}" = "ext4" ]; then
+               umount_bow_partition "${LABEL}" "${DIRECTORY}"
+       else
+               "$UMOUNT" "${DIRECTORY}"
+       fi
+}
+
 #------------------------------------------------
 #       umount_partitions
 #------------------------------------------------
@@ -94,10 +236,21 @@ umount_partitions() {
        "$UMOUNT" "${FAKE_ROOT}/proc"
 
        if [ ! "z${PART_USER}" = "z" ]; then
-               "$UMOUNT" "${FAKE_ROOT}/${USER_MNT}"
+               if [ "${UPGRADE_SUCCESS}" = "1" ]; then
+                       commit_partition user
+               fi
+               umount_partition user "${FAKE_ROOT}/${USER_MNT}"
+       fi
+
+       if [ "${UPGRADE_SUCCESS}" = "1" ]; then
+               commit_partition system-data
        fi
-       "$UMOUNT" "${FAKE_ROOT}/${SYSTEM_DATA_MNT}"
-       "$UMOUNT" "${FAKE_ROOT}"
+       umount_partition system-data "${FAKE_ROOT}/${SYSTEM_DATA_MNT}"
+
+       if [ "${UPGRADE_SUCCESS}" = "1" ]; then
+               commit_partition rootfs
+       fi
+       umount_partition rootfs "${FAKE_ROOT}"
 }
 
 #------------------------------------------------
@@ -246,6 +399,7 @@ check_for_rw_power_fail() {
        if [ -r "${STATUS_FILE}" ]; then
                log "[Info] ${STATUS_FILE} exists" "${INT_LOG_FILE}"
                log "[Info] Status file: $("$CAT" "${STATUS_FILE}")" "${INT_LOG_FILE}"
+               UPGRADE_SUCCESS=1
                "$SYNC"
                umount_partitions
                exec /sbin/fus_rw-init
@@ -308,11 +462,22 @@ remake_hash_table() {
        fi
 }
 
+#------------------------------------------------
+#      mark_rw_update
+#------------------------------------------------
+mark_rw_update() {
+       echo "start" > ${STATUS_FILE}
+}
+
 #------------------------------------------------
 #      Main Routine Start
 #------------------------------------------------
 
-mount_partitions
+if ! mount_partitions ; then
+       umount_partitions
+       log "[Error] Upgrade failed"
+       do_reboot
+fi
 
 # For debugging - It should be deleted on Release
 /sbin/agetty -l /bin/bash -n --keep-baud 115200,38400,9600 console linux &
@@ -347,11 +512,14 @@ RO_PROGRESS_FILE=/tmp/upgrade/ro_progress
 if [ -f "${RO_PROGRESS_FILE}" ]; then
        echo -1 > "${RO_PROGRESS_FILE}"
 fi
-umount_partitions
 
 if [ "$fota_result" = "0" ] && [ "$remake_result" = "0" ]; then
+       UPGRADE_SUCCESS=1
+       mark_rw_update
+       umount_partitions
        exec /sbin/fus_rw-init
 else
+       umount_partitions
        log "[Error] Upgrade FAILED"
        do_reboot
 fi
index 26e6ff9a2ddc74592df94901ae72e100e6f66813..091092c95f325d3fabf18e58cb7c46d8a25c421c 100755 (executable)
@@ -13,13 +13,9 @@ INT_LOG_FILE=${INT_LOG_DIR}/fota_internal.log
 
 CAT="/bin/cat"
 MOUNT="/bin/mount"
-UMOUNT="/bin/umount"
 GREP="/bin/grep"
 BLKID="/usr/sbin/blkid"
 
-SYSTEM_DATA_MNT=opt
-USER_MNT=opt/usr
-
 #------------------------------------------------
 #       get partition id
 #------------------------------------------------
@@ -29,16 +25,6 @@ get_partition_id() {
     PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device || "$BLKID" --match-token LABEL=user -o device)
 }
 
-#------------------------------------------------
-#       check_user_partition
-#------------------------------------------------
-check_user_partition() {
-    RET=$("$CAT" ${FAKE_ROOT}/etc/fstab | "$GREP" "user")
-    if [ "z$RET" = "z" ]; then
-        return 0
-    fi
-    return 1
-}
 
 #------------------------------------------------
 #       mount_partitions
@@ -47,13 +33,6 @@ mount_partitions() {
     get_partition_id
 
     "$MOUNT" -o ro ${PART_ROOTFS} ${FAKE_ROOT}
-    "$MOUNT" ${PART_SYSTEM_DATA} ${FAKE_ROOT}/${SYSTEM_DATA_MNT}
-
-    check_user_partition
-    WITH_USR_PART=$?
-    if [ "$WITH_USR_PART" = "1" ]; then
-        "$MOUNT" ${PART_USER} ${FAKE_ROOT}/${USER_MNT}
-    fi
 
     "$MOUNT" -t proc none ${FAKE_ROOT}/proc
     "$MOUNT" -t sysfs none ${FAKE_ROOT}/sys