lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 181/220] lightnvm: pblk: guarantee emeta on line close
    Date
    From: Javier González <javier@javigon.com>

    [ Upstream commit 9cc85bc761f83da41935cdd6edcdb7c122bc90bf ]

    If a line is recovered from open chunks, the memory structures for
    emeta have not necessarily been properly set on line initialization.
    When closing a line, make sure that emeta is consistent so that the line
    can be recovered on the fast path on next reboot.

    Also, remove a couple of empty lines at the end of the function.

    Signed-off-by: Javier González <javier@cnexlabs.com>
    Signed-off-by: Matias Bjørling <mb@lightnvm.io>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/lightnvm/pblk-core.c | 13 +++++++++++--
    1 file changed, 11 insertions(+), 2 deletions(-)

    diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
    index fd322565fb0f9..8dce31dbf2cbc 100644
    --- a/drivers/lightnvm/pblk-core.c
    +++ b/drivers/lightnvm/pblk-core.c
    @@ -1773,6 +1773,17 @@ void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line)
    wa->pad = cpu_to_le64(atomic64_read(&pblk->pad_wa));
    wa->gc = cpu_to_le64(atomic64_read(&pblk->gc_wa));

    + if (le32_to_cpu(emeta_buf->header.identifier) != PBLK_MAGIC) {
    + emeta_buf->header.identifier = cpu_to_le32(PBLK_MAGIC);
    + memcpy(emeta_buf->header.uuid, pblk->instance_uuid, 16);
    + emeta_buf->header.id = cpu_to_le32(line->id);
    + emeta_buf->header.type = cpu_to_le16(line->type);
    + emeta_buf->header.version_major = EMETA_VERSION_MAJOR;
    + emeta_buf->header.version_minor = EMETA_VERSION_MINOR;
    + emeta_buf->header.crc = cpu_to_le32(
    + pblk_calc_meta_header_crc(pblk, &emeta_buf->header));
    + }
    +
    emeta_buf->nr_valid_lbas = cpu_to_le64(line->nr_valid_lbas);
    emeta_buf->crc = cpu_to_le32(pblk_calc_emeta_crc(pblk, emeta_buf));

    @@ -1790,8 +1801,6 @@ void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line)
    spin_unlock(&l_mg->close_lock);

    pblk_line_should_sync_meta(pblk);
    -
    -
    }

    static void pblk_save_lba_list(struct pblk *pblk, struct pblk_line *line)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-22 12:09    [W:2.635 / U:1.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site