Skip to content

Commit

Permalink
UBI: introduce the VID buffer concept
Browse files Browse the repository at this point in the history 
Currently, all VID headers are allocated and freed using the
ubi_zalloc_vid_hdr() and ubi_free_vid_hdr() function. These functions
make sure to align allocation on ubi->vid_hdr_alsize and adjust the
vid_hdr pointer to match the ubi->vid_hdr_shift requirements.
This works fine, but is a bit convoluted.
Moreover, the future introduction of LEB consolidation (needed to support
MLC/TLC NANDs) will allows a VID buffer to contain more than one VID
header.

Hence the creation of a ubi_vid_io_buf struct to attach extra information
to the VID header.

We currently only store the actual pointer of the underlying buffer, but
will soon add the number of VID headers contained in the buffer.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
  • Loading branch information
Boris Brezillon authored and Richard Weinberger committed Oct 2, 2016
1 parent 799dca3 commit 3291b52
Show file tree
Hide file tree
Showing 7 changed files with 218 additions and 142 deletions.
40 changes: 21 additions & 19 deletions drivers/mtd/ubi/attach.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ int ubi_compare_lebs(struct ubi_device *ubi, const struct ubi_ainf_peb *aeb,
{
int len, err, second_is_newer, bitflips = 0, corrupted = 0;
uint32_t data_crc, crc;
struct ubi_vid_hdr *vh = NULL;
struct ubi_vid_io_buf *vidb = NULL;
unsigned long long sqnum2 = be64_to_cpu(vid_hdr->sqnum);

if (sqnum2 == aeb->sqnum) {
Expand Down Expand Up @@ -496,12 +496,12 @@ int ubi_compare_lebs(struct ubi_device *ubi, const struct ubi_ainf_peb *aeb,
return bitflips << 1;
}

vh = ubi_zalloc_vid_hdr(ubi, GFP_KERNEL);
if (!vh)
vidb = ubi_alloc_vid_buf(ubi, GFP_KERNEL);
if (!vidb)
return -ENOMEM;

pnum = aeb->pnum;
err = ubi_io_read_vid_hdr(ubi, pnum, vh, 0);
err = ubi_io_read_vid_hdr(ubi, pnum, vidb, 0);
if (err) {
if (err == UBI_IO_BITFLIPS)
bitflips = 1;
Expand All @@ -515,7 +515,7 @@ int ubi_compare_lebs(struct ubi_device *ubi, const struct ubi_ainf_peb *aeb,
}
}

vid_hdr = vh;
vid_hdr = ubi_get_vid_hdr(vidb);
}

/* Read the data of the copy and check the CRC */
Expand All @@ -541,7 +541,7 @@ int ubi_compare_lebs(struct ubi_device *ubi, const struct ubi_ainf_peb *aeb,
}
mutex_unlock(&ubi->buf_mutex);

ubi_free_vid_hdr(ubi, vh);
ubi_free_vid_buf(vidb);

if (second_is_newer)
dbg_bld("second PEB %d is newer, copy_flag is set", pnum);
Expand All @@ -553,7 +553,7 @@ int ubi_compare_lebs(struct ubi_device *ubi, const struct ubi_ainf_peb *aeb,
out_unlock:
mutex_unlock(&ubi->buf_mutex);
out_free_vidh:
ubi_free_vid_hdr(ubi, vh);
ubi_free_vid_buf(vidb);
return err;
}

Expand Down Expand Up @@ -955,7 +955,8 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
int pnum, bool fast)
{
struct ubi_ec_hdr *ech = ai->ech;
struct ubi_vid_hdr *vidh = ai->vidh;
struct ubi_vid_io_buf *vidb = ai->vidb;
struct ubi_vid_hdr *vidh = ubi_get_vid_hdr(vidb);
long long ec;
int err, bitflips = 0, vol_id = -1, ec_err = 0;

Expand Down Expand Up @@ -1053,7 +1054,7 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,

/* OK, we've done with the EC header, let's look at the VID header */

err = ubi_io_read_vid_hdr(ubi, pnum, vidh, 0);
err = ubi_io_read_vid_hdr(ubi, pnum, vidb, 0);
if (err < 0)
return err;
switch (err) {
Expand Down Expand Up @@ -1396,8 +1397,8 @@ static int scan_all(struct ubi_device *ubi, struct ubi_attach_info *ai,
if (!ai->ech)
return err;

ai->vidh = ubi_zalloc_vid_hdr(ubi, GFP_KERNEL);
if (!ai->vidh)
ai->vidb = ubi_alloc_vid_buf(ubi, GFP_KERNEL);
if (!ai->vidb)
goto out_ech;

for (pnum = start; pnum < ubi->peb_count; pnum++) {
Expand Down Expand Up @@ -1446,13 +1447,13 @@ static int scan_all(struct ubi_device *ubi, struct ubi_attach_info *ai,
if (err)
goto out_vidh;

ubi_free_vid_hdr(ubi, ai->vidh);
ubi_free_vid_buf(ai->vidb);
kfree(ai->ech);

return 0;

out_vidh:
ubi_free_vid_hdr(ubi, ai->vidh);
ubi_free_vid_buf(ai->vidb);
out_ech:
kfree(ai->ech);
return err;
Expand Down Expand Up @@ -1510,8 +1511,8 @@ static int scan_fast(struct ubi_device *ubi, struct ubi_attach_info **ai)
if (!scan_ai->ech)
goto out_ai;

scan_ai->vidh = ubi_zalloc_vid_hdr(ubi, GFP_KERNEL);
if (!scan_ai->vidh)
scan_ai->vidb = ubi_alloc_vid_buf(ubi, GFP_KERNEL);
if (!scan_ai->vidb)
goto out_ech;

for (pnum = 0; pnum < UBI_FM_MAX_START; pnum++) {
Expand All @@ -1523,7 +1524,7 @@ static int scan_fast(struct ubi_device *ubi, struct ubi_attach_info **ai)
goto out_vidh;
}

ubi_free_vid_hdr(ubi, scan_ai->vidh);
ubi_free_vid_buf(scan_ai->vidb);
kfree(scan_ai->ech);

if (scan_ai->force_full_scan)
Expand All @@ -1544,7 +1545,7 @@ static int scan_fast(struct ubi_device *ubi, struct ubi_attach_info **ai)
return err;

out_vidh:
ubi_free_vid_hdr(ubi, scan_ai->vidh);
ubi_free_vid_buf(scan_ai->vidb);
out_ech:
kfree(scan_ai->ech);
out_ai:
Expand Down Expand Up @@ -1668,7 +1669,8 @@ int ubi_attach(struct ubi_device *ubi, int force_scan)
*/
static int self_check_ai(struct ubi_device *ubi, struct ubi_attach_info *ai)
{
struct ubi_vid_hdr *vidh = ai->vidh;
struct ubi_vid_io_buf *vidb = ai->vidb;
struct ubi_vid_hdr *vidh = ubi_get_vid_hdr(vidb);
int pnum, err, vols_found = 0;
struct rb_node *rb1, *rb2;
struct ubi_ainf_volume *av;
Expand Down Expand Up @@ -1804,7 +1806,7 @@ static int self_check_ai(struct ubi_device *ubi, struct ubi_attach_info *ai)

last_aeb = aeb;

err = ubi_io_read_vid_hdr(ubi, aeb->pnum, vidh, 1);
err = ubi_io_read_vid_hdr(ubi, aeb->pnum, vidb, 1);
if (err && err != UBI_IO_BITFLIPS) {
ubi_err(ubi, "VID header is not OK (%d)",
err);
Expand Down
Loading

0 comments on commit 3291b52

Please sign in to comment.