lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 165/757] nvme: fix error handling in nvme_ns_report_zones
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ Upstream commit 936fab503ff4af94f5f9c0b549f3ab4d435500ec ]

    nvme_submit_sync_cmd can return positive NVMe error codes in addition to
    the negative Linux error code, which are currently ignored. Fix this
    by removing __nvme_ns_report_zones and handling the errors from
    nvme_submit_sync_cmd in the caller instead of multiplexing the return
    value and the number of zones reported into a single return value.

    Fixes: 240e6ee272c0 ("nvme: support for zoned namespaces")
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/zns.c | 41 ++++++++++++++++-------------------------
    1 file changed, 16 insertions(+), 25 deletions(-)

    diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c
    index 57cfd78731fbb..53efecb678983 100644
    --- a/drivers/nvme/host/zns.c
    +++ b/drivers/nvme/host/zns.c
    @@ -133,28 +133,6 @@ static void *nvme_zns_alloc_report_buffer(struct nvme_ns *ns,
    return NULL;
    }

    -static int __nvme_ns_report_zones(struct nvme_ns *ns, sector_t sector,
    - struct nvme_zone_report *report,
    - size_t buflen)
    -{
    - struct nvme_command c = { };
    - int ret;
    -
    - c.zmr.opcode = nvme_cmd_zone_mgmt_recv;
    - c.zmr.nsid = cpu_to_le32(ns->head->ns_id);
    - c.zmr.slba = cpu_to_le64(nvme_sect_to_lba(ns, sector));
    - c.zmr.numd = cpu_to_le32(nvme_bytes_to_numd(buflen));
    - c.zmr.zra = NVME_ZRA_ZONE_REPORT;
    - c.zmr.zrasf = NVME_ZRASF_ZONE_REPORT_ALL;
    - c.zmr.pr = NVME_REPORT_ZONE_PARTIAL;
    -
    - ret = nvme_submit_sync_cmd(ns->queue, &c, report, buflen);
    - if (ret)
    - return ret;
    -
    - return le64_to_cpu(report->nr_zones);
    -}
    -
    static int nvme_zone_parse_entry(struct nvme_ns *ns,
    struct nvme_zone_descriptor *entry,
    unsigned int idx, report_zones_cb cb,
    @@ -182,6 +160,7 @@ static int nvme_ns_report_zones(struct nvme_ns *ns, sector_t sector,
    unsigned int nr_zones, report_zones_cb cb, void *data)
    {
    struct nvme_zone_report *report;
    + struct nvme_command c = { };
    int ret, zone_idx = 0;
    unsigned int nz, i;
    size_t buflen;
    @@ -190,14 +169,26 @@ static int nvme_ns_report_zones(struct nvme_ns *ns, sector_t sector,
    if (!report)
    return -ENOMEM;

    + c.zmr.opcode = nvme_cmd_zone_mgmt_recv;
    + c.zmr.nsid = cpu_to_le32(ns->head->ns_id);
    + c.zmr.numd = cpu_to_le32(nvme_bytes_to_numd(buflen));
    + c.zmr.zra = NVME_ZRA_ZONE_REPORT;
    + c.zmr.zrasf = NVME_ZRASF_ZONE_REPORT_ALL;
    + c.zmr.pr = NVME_REPORT_ZONE_PARTIAL;
    +
    sector &= ~(ns->zsze - 1);
    while (zone_idx < nr_zones && sector < get_capacity(ns->disk)) {
    memset(report, 0, buflen);
    - ret = __nvme_ns_report_zones(ns, sector, report, buflen);
    - if (ret < 0)
    +
    + c.zmr.slba = cpu_to_le64(nvme_sect_to_lba(ns, sector));
    + ret = nvme_submit_sync_cmd(ns->queue, &c, report, buflen);
    + if (ret) {
    + if (ret > 0)
    + ret = -EIO;
    goto out_free;
    + }

    - nz = min_t(unsigned int, ret, nr_zones);
    + nz = min((unsigned int)le64_to_cpu(report->nr_zones), nr_zones);
    if (!nz)
    break;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:30    [W:4.073 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site