lkml.org 
[lkml]   [2017]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 102/178] ubi/upd: Always flush after prepared for an update
    3.16.46-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sebastian Siewior <bigeasy@linutronix.de>

    commit 9cd9a21ce070be8a918ffd3381468315a7a76ba6 upstream.

    In commit 6afaf8a484cb ("UBI: flush wl before clearing update marker") I
    managed to trigger and fix a similar bug. Now here is another version of
    which I assumed it wouldn't matter back then but it turns out UBI has a
    check for it and will error out like this:

    |ubi0 warning: validate_vid_hdr: inconsistent used_ebs
    |ubi0 error: validate_vid_hdr: inconsistent VID header at PEB 592

    All you need to trigger this is? "ubiupdatevol /dev/ubi0_0 file" + a
    powercut in the middle of the operation.
    ubi_start_update() sets the update-marker and puts all EBs on the erase
    list. After that userland can proceed to write new data while the old EB
    aren't erased completely. A powercut at this point is usually not that
    much of a tragedy. UBI won't give read access to the static volume
    because it has the update marker. It will most likely set the corrupted
    flag because it misses some EBs.
    So we are all good. Unless the size of the image that has been written
    differs from the old image in the magnitude of at least one EB. In that
    case UBI will find two different values for `used_ebs' and refuse to
    attach the image with the error message mentioned above.

    So in order not to get in the situation, the patch will ensure that we
    wait until everything is removed before it tries to write any data.
    The alternative would be to detect such a case and remove all EBs at the
    attached time after we processed the volume-table and see the
    update-marker set. The patch looks bigger and I doubt it is worth it
    since usually the write() will wait from time to time for a new EB since
    usually there not that many spare EB that can be used.

    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/mtd/ubi/upd.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/mtd/ubi/upd.c
    +++ b/drivers/mtd/ubi/upd.c
    @@ -148,11 +148,11 @@ int ubi_start_update(struct ubi_device *
    return err;
    }

    - if (bytes == 0) {
    - err = ubi_wl_flush(ubi, UBI_ALL, UBI_ALL);
    - if (err)
    - return err;
    + err = ubi_wl_flush(ubi, UBI_ALL, UBI_ALL);
    + if (err)
    + return err;

    + if (bytes == 0) {
    err = clear_update_marker(ubi, vol, 0);
    if (err)
    return err;
    \
     
     \ /
      Last update: 2017-07-16 15:59    [W:3.565 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site