1. 19 10月, 2010 3 次提交
  2. 30 8月, 2010 4 次提交
    • A
      UBI: do not oops when erroneous PEB is scheduled for scrubbing · d3f6e6c6
      Artem Bityutskiy 提交于
      When an erroneous PEB is scheduling for scrubbing, we end up with the
      following oops:
      
      [<c0162404>] (prot_queue_del+0x0/0x50) from [<c01635b4>] (ubi_wl_scrub_peb+0xec/0x13c)
      [<c01634c8>] (ubi_wl_scrub_peb+0x0/0x13c) from [<c01603bc>] (ubi_eba_read_leb+0x200/0x428)
      [<c01601bc>] (ubi_eba_read_leb+0x0/0x428) from [<c015e3c0>] (ubi_leb_read+0xe8/0x138)
      [<c015e2d8>] (ubi_leb_read+0x0/0x138) from [<c00d6918>] (ubifs_start_scan+0x7c/0xf4)
      [<c00d689c>] (ubifs_start_scan+0x0/0xf4) from [<c00e3650>] (ubifs_recover_leb+0x3c/0x730)
      [<c00e3614>] (ubifs_recover_leb+0x0/0x730) from [<c00e444c>] (ubifs_recover_log_leb+0xc8/0x2dc)
      [<c00e4384>] (ubifs_recover_log_leb+0x0/0x2dc) from [<c00d7c20>] (ubifs_replay_journal+0xb90/0x13a4)
      [<c00d7090>] (ubifs_replay_journal+0x0/0x13a4) from [<c00cdd68>] (ubifs_fill_super+0xb84/0x1054)
      [<c00cd1e4>] (ubifs_fill_super+0x0/0x1054) from [<c00ced04>] (ubifs_get_sb+0xc4/0x2ac)
      [<c00cec40>] (ubifs_get_sb+0x0/0x2ac) from [<c007f04c>] (vfs_kern_mount+0x58/0x94)
      [<c007eff4>] (vfs_kern_mount+0x0/0x94) from [<c007f0e8>] (do_kern_mount+0x40/0xe8)
      [<c007f0a8>] (do_kern_mount+0x0/0xe8) from [<c0095628>] (do_new_mount+0x68/0x8c)
      [<c00955c0>] (do_new_mount+0x0/0x8c) from [<c00957a8>] (do_mount+0x15c/0x1b8)
      [<c009564c>] (do_mount+0x0/0x1b8) from [<c0095890>] (sys_mount+0x8c/0xd4)
      [<c0095804>] (sys_mount+0x0/0xd4) from [<c0023c00>] (ret_fast_syscall+0x0/0x2c)
      Kernel panic - not syncing: Fatal exception
      
      The problem is that 'ubi_wl_scrub_peb()' does not expect that PEBs may
      be in the erroneous tree, which is a bug. This patch fixes the bug
      and adds corresponding check to 'ubi_wl_scrub_peb()'. Now it will simply
      ignore erroneous PEBs, instead of causing an oops.
      Reported-by: NMatthieu CASTET <matthieu.castet@parrot.com>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      d3f6e6c6
    • R
      UBI: fix kconfig unmet dependency · 1deacd7a
      Randy Dunlap 提交于
      warning: (OPTPROBES && KPROBES && HAVE_OPTPROBES && !PREEMPT && DEBUG_KERNEL ||
      MTD_UBI_DEBUG && MTD && SYSFS && MTD_UBI || UBIFS_FS_DEBUG && MISC_FILESYSTEMS &&
      UBIFS_FS || LOCKDEP && DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT &&
      STACKTRACE_SUPPORT && LOCKDEP_SUPPORT || LATENCYTOP && HAVE_LATENCYTOP_SUPPORT &&
      DEBUG_KERNEL && STACKTRACE_SUPPORT && PROC_FS) selects KALLSYMS_ALL
      which has unmet direct dependencies (DEBUG_KERNEL && KALLSYMS)
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      1deacd7a
    • A
      UBI: fix forward compatibility · 80c1c16f
      Artem Bityutskiy 提交于
      Commit 0798cea8 "UBI: improve corrupted flash handling"
      broke delet-compatible volumes handling - it introduced a limit of 8 eraseblocks which
      may be corrupted. And delete-compatible eraseblocks are added to the "corrupted" list,
      so if we'd have a large delete-compatible volume, UBI would refuse it.
      
      The fix is to add delete-compatible volumes to the erase list instead. Indeed, they are
      corrupted, we just have to erase them.
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      80c1c16f
    • J
      UBI: eliminate update of list_for_each_entry loop cursor · 01ebc12f
      Julia Lawall 提交于
      list_for_each_entry uses its first argument to move from one element to the
      next, so modifying it can break the iteration.  The variable re1 is already
      used within the loop as a temporary variable, and is not live here.
      
      The semantic match that finds this problem is as follows:
      (http://coccinelle.lip6.fr/)
      
      // <smpl>
      @r@
      iterator name list_for_each_entry;
      expression x,E;
      position p1,p2;
      @@
      
      list_for_each_entry@p1(x,...) { <... x =@p2 E ...> }
      
      @@
      expression x,E;
      position r.p1,r.p2;
      statement S;
      @@
      
      *x =@p2 E
      ...
      list_for_each_entry@p1(x,...) S
      // </smpl>
      Signed-off-by: NJulia Lawall <julia@diku.dk>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      01ebc12f
  3. 02 8月, 2010 2 次提交
  4. 16 6月, 2010 1 次提交
  5. 14 6月, 2010 1 次提交
    • A
      UBI: fix error message and compilation warnings · f5d5b1f8
      Artem Bityutskiy 提交于
      Fix the followong compilation warnings introduced by commit
      095751a6:
      
      drivers/mtd/ubi/scan.c: In function 'check_what_we_have':
      drivers/mtd/ubi/scan.c:960: warning: passing argument 1 of 'get_random_bytes' discards qualifiers from pointer target type
      
      Fix the following compilation warnings introduced by commit
      1a49af2c:
      
      drivers/mtd/ubi/io.c: In function 'ubi_io_read':
      drivers/mtd/ubi/io.c:153: warning: initialization makes integer from pointer without a cast
      drivers/mtd/ubi/io.c:170: warning: format '%s' expects type 'char *', but argument 5 has type 'int'
      drivers/mtd/ubi/io.c:177: warning: format '%zd' expects type 'signed size_t', but argument 7 has type 'int'
      drivers/mtd/ubi/io.c:177: warning: too many arguments for format
      
      Also, amend the ECC error code string and add brackets and whitespace
      there - this should make the message readable.
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      f5d5b1f8
  6. 11 6月, 2010 2 次提交
  7. 04 6月, 2010 4 次提交
  8. 28 5月, 2010 1 次提交
  9. 07 5月, 2010 2 次提交
  10. 06 5月, 2010 1 次提交
    • M
      UBI: init even if MTD device cannot be attached, if built into kernel · af7ad7a0
      Marc Kleine-Budde 提交于
      UBI can be built into the kernel or be compiled as a kernel module.
      Further on the command line one can specify MTD devices to be attach to
      UBI while loading. In the current implementation the UBI driver refuses
      to load if one of the MTD devices cannot be attached.
      
      Consider:
      1) UBI compiled into the kernel and
      2) a MTD device specified on the command line and
      3) this MTD device contains bogus data (for whatever reason).
      
      During init UBI tries to attach the MTD device is this fails the whole
      UBI subsystem isn't initialized. Later the userspace cannot attach any
      MTD to UBI because UBI isn't loaded.
      
      This patch keeps the current behaviour: if UBI is compiled as a module
      and a MTD device cannot be attached the UBI module cannot be loaded,
      but changes it for the UBI-is-built-into-the-kernel usecase.
      
      If UBI is builtin, a not attachable MTD device doen't stop UBI from
      initializing. This slightly modifies the behaviour if multiple MTD
      devices are specified on the command line. Now every MTD device is
      probed and, if possible, attached, i.e. a faulty MTD device doesn't
      stop the others from being attached.
      
      Artem: tweaked the patch
      Signed-off-by: NMarc Kleine-Budde <mkl@pengutronix.de>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      af7ad7a0
  11. 03 5月, 2010 1 次提交
  12. 30 3月, 2010 1 次提交
    • T
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking... · 5a0e3ad6
      Tejun Heo 提交于
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
      
      percpu.h is included by sched.h and module.h and thus ends up being
      included when building most .c files.  percpu.h includes slab.h which
      in turn includes gfp.h making everything defined by the two files
      universally available and complicating inclusion dependencies.
      
      percpu.h -> slab.h dependency is about to be removed.  Prepare for
      this change by updating users of gfp and slab facilities include those
      headers directly instead of assuming availability.  As this conversion
      needs to touch large number of source files, the following script is
      used as the basis of conversion.
      
        http://userweb.kernel.org/~tj/misc/slabh-sweep.py
      
      The script does the followings.
      
      * Scan files for gfp and slab usages and update includes such that
        only the necessary includes are there.  ie. if only gfp is used,
        gfp.h, if slab is used, slab.h.
      
      * When the script inserts a new include, it looks at the include
        blocks and try to put the new include such that its order conforms
        to its surrounding.  It's put in the include block which contains
        core kernel includes, in the same order that the rest are ordered -
        alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
        doesn't seem to be any matching order.
      
      * If the script can't find a place to put a new include (mostly
        because the file doesn't have fitting include block), it prints out
        an error message indicating which .h file needs to be added to the
        file.
      
      The conversion was done in the following steps.
      
      1. The initial automatic conversion of all .c files updated slightly
         over 4000 files, deleting around 700 includes and adding ~480 gfp.h
         and ~3000 slab.h inclusions.  The script emitted errors for ~400
         files.
      
      2. Each error was manually checked.  Some didn't need the inclusion,
         some needed manual addition while adding it to implementation .h or
         embedding .c file was more appropriate for others.  This step added
         inclusions to around 150 files.
      
      3. The script was run again and the output was compared to the edits
         from #2 to make sure no file was left behind.
      
      4. Several build tests were done and a couple of problems were fixed.
         e.g. lib/decompress_*.c used malloc/free() wrappers around slab
         APIs requiring slab.h to be added manually.
      
      5. The script was run on all .h files but without automatically
         editing them as sprinkling gfp.h and slab.h inclusions around .h
         files could easily lead to inclusion dependency hell.  Most gfp.h
         inclusion directives were ignored as stuff from gfp.h was usually
         wildly available and often used in preprocessor macros.  Each
         slab.h inclusion directive was examined and added manually as
         necessary.
      
      6. percpu.h was updated not to include slab.h.
      
      7. Build test were done on the following configurations and failures
         were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
         distributed build env didn't work with gcov compiles) and a few
         more options had to be turned off depending on archs to make things
         build (like ipr on powerpc/64 which failed due to missing writeq).
      
         * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
         * powerpc and powerpc64 SMP allmodconfig
         * sparc and sparc64 SMP allmodconfig
         * ia64 SMP allmodconfig
         * s390 SMP allmodconfig
         * alpha SMP allmodconfig
         * um on x86_64 SMP allmodconfig
      
      8. percpu.h modifications were reverted so that it could be applied as
         a separate patch and serve as bisection point.
      
      Given the fact that I had only a couple of failures from tests on step
      6, I'm fairly confident about the coverage of this conversion patch.
      If there is a breakage, it's likely to be something in one of the arch
      headers which should be easily discoverable easily on most builds of
      the specific arch.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Guess-its-ok-by: NChristoph Lameter <cl@linux-foundation.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
      5a0e3ad6
  13. 08 3月, 2010 1 次提交
  14. 01 2月, 2010 5 次提交
    • A
      UBI: add write checking · 6e9065d7
      Artem Bityutskiy 提交于
      Add an extra debugging check function which validates writes.
      After every write it reads the data back, compares it with the
      original data, and complains if they mismatch.
      
      Useful for debugging. No-op if extra debugging checks are disabled.
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      6e9065d7
    • A
      UBI: simplify debugging return codes · adbf05e3
      Artem Bityutskiy 提交于
      UBI debugging functions were a little bit over-engineered and
      returned more error codes than needed, and the callers had to
      do useless checks. Simplify the return codes.
      
      Impact: only debugging code is affected, which means that for
              non-developers this is a no-op patch.
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      adbf05e3
    • A
      UBI: fix attaching error path · 0bf1c439
      Artem Bityutskiy 提交于
      In the error path of 'ubi_attach_mtd_dev()' we have a tricky situation:
      we have to release things differently depending on at which point
      the failure happening. Namely, if @ubi->dev is not initialized, we have
      to free everything ourselves. But if it was, we should not free the @ubi
      object, because it will be freed in the 'dev_release()' function. And
      we did not get this situation right.
      
      This patch introduces additional argument to the 'uif_init()' function.
      On exit, this argument indicates whether the final 'free(ubi)' will
      happen in 'dev_release()' or not. So the caller always knows how to
      properly release the resources.
      
      Impact: all memory is now correctly released when UBI fails to attach
              an MTD device.
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      0bf1c439
    • A
      UBI: support attaching by MTD character device name · f9b0080e
      Artem Bityutskiy 提交于
      This patch adds a capability to attach MTD devices by their character
      device paths. For example, one can do:
      
      $ modprobe ubi mtd=/dev/mtd0
      
      to attach /dev/mtd0.
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      f9b0080e
    • A
      UBI: mark few variables as __initdata · 9e0c7ef3
      Artem Bityutskiy 提交于
      The @mtd_devs and @mtd_dev_param variables are used only during the
      initialization, and all functions that use the variables have
      the __init prefix. This means we can safely mark the variables
      as __initdata, which is a tiny optimization.
      
      Impact: tiny RAM consumption optimization when UBI is used as a kernel
              module.
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      9e0c7ef3
  15. 27 1月, 2010 1 次提交
  16. 19 1月, 2010 1 次提交
  17. 12 1月, 2010 2 次提交
  18. 04 12月, 2009 1 次提交
    • S
      UBI: flush wl before clearing update marker · 6afaf8a4
      Sebastian Andrzej Siewior 提交于
      ubiupdatevol -t does the following:
      - ubi_start_update()
        - set_update_marker()
        - for all LEBs ubi_eba_unmap_leb()
        - clear_update_marker()
        - ubi_wl_flush()
      
      ubi_wl_flush() physically erases all PEB, once it returns all PEBs are
      empty. clear_update_marker() has the update marker written after return.
      If there is a power cut between the last two functions then the UBI
      volume has no longer the "update" marker set and may have some valid
      LEBs while some of them may be gone.
      If that volume in question happens to be a UBIFS volume, then mount
      will fail with
      
      |UBIFS error (pid 1361): ubifs_read_node: bad node type (255 but expected 6)
      |UBIFS error (pid 1361): ubifs_read_node: bad node at LEB 0:0
      |Not a node, first 24 bytes:
      |00000000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
      
      if there is at least one valid LEB and the wear-leveling worker managed
      to clear LEB 0.
      
      The patch waits for the wl worker to finish prior clearing the "update"
      marker on flash. The two new LEB which are scheduled for erasing after
      clear_update_marker() should not matter because they are only visible to
      UBI.
      Signed-off-by: NSebastian Andrzej Siewior <sebastian@breakpoint.cc>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      Cc: stable@kernel.org
      6afaf8a4
  19. 24 11月, 2009 1 次提交
  20. 09 11月, 2009 1 次提交
  21. 20 10月, 2009 2 次提交
  22. 21 9月, 2009 1 次提交
  23. 15 8月, 2009 1 次提交
    • A
      UBI: improve NOR flash erasure quirk · de75c771
      Artem Bityutskiy 提交于
      More testing of NOR flash against power cuts showed that sometimes
      eraseblocks may be unwritable, and we cannot really invalidate
      them before erasure. But in this case the eraseblock probably
      contains garbage anyway, and we do not have to invalidate the
      headers. This assumption might be not true, but this is at least
      what I have observed. So if we cannot invalidate the headers,
      we make sure that the PEB does not contain valid VID header.
      If this is true, everything is fine, otherwise we panic.
      de75c771