lkml.org 
[lkml]   [2020]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 52/57] nvme: consolidate chunk_sectors settings
    Date
    From: Keith Busch <kbusch@kernel.org>

    commit 38adf94e166e3cb4eb89683458ca578051e8218d upstream.

    Move the quirked chunk_sectors setting to the same location as noiob so
    one place registers this setting. And since the noiob value is only used
    locally, remove the member from struct nvme_ns.

    Signed-off-by: Keith Busch <kbusch@kernel.org>
    Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Revanth Rajashekar <revanth.rajashekar@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/nvme/host/core.c | 22 ++++++++++------------
    drivers/nvme/host/nvme.h | 1 -
    2 files changed, 10 insertions(+), 13 deletions(-)

    --- a/drivers/nvme/host/core.c
    +++ b/drivers/nvme/host/core.c
    @@ -1680,12 +1680,6 @@ static void nvme_init_integrity(struct g
    }
    #endif /* CONFIG_BLK_DEV_INTEGRITY */

    -static void nvme_set_chunk_size(struct nvme_ns *ns)
    -{
    - u32 chunk_size = nvme_lba_to_sect(ns, ns->noiob);
    - blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(chunk_size));
    -}
    -
    static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)
    {
    struct nvme_ctrl *ctrl = ns->ctrl;
    @@ -1840,6 +1834,7 @@ static void nvme_update_disk_info(struct
    static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
    {
    struct nvme_ns *ns = disk->private_data;
    + u32 iob;

    /*
    * If identify namespace failed, use default 512 byte block size so
    @@ -1848,7 +1843,13 @@ static void __nvme_revalidate_disk(struc
    ns->lba_shift = id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ds;
    if (ns->lba_shift == 0)
    ns->lba_shift = 9;
    - ns->noiob = le16_to_cpu(id->noiob);
    +
    + if ((ns->ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) &&
    + is_power_of_2(ns->ctrl->max_hw_sectors))
    + iob = ns->ctrl->max_hw_sectors;
    + else
    + iob = nvme_lba_to_sect(ns, le16_to_cpu(id->noiob));
    +
    ns->ms = le16_to_cpu(id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ms);
    ns->ext = ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT);
    /* the PI implementation requires metadata equal t10 pi tuple size */
    @@ -1857,8 +1858,8 @@ static void __nvme_revalidate_disk(struc
    else
    ns->pi_type = 0;

    - if (ns->noiob)
    - nvme_set_chunk_size(ns);
    + if (iob)
    + blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(iob));
    nvme_update_disk_info(disk, ns, id);
    #ifdef CONFIG_NVME_MULTIPATH
    if (ns->head->disk) {
    @@ -2209,9 +2210,6 @@ static void nvme_set_queue_limits(struct
    blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);
    blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));
    }
    - if ((ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) &&
    - is_power_of_2(ctrl->max_hw_sectors))
    - blk_queue_chunk_sectors(q, ctrl->max_hw_sectors);
    blk_queue_virt_boundary(q, ctrl->page_size - 1);
    if (ctrl->vwc & NVME_CTRL_VWC_PRESENT)
    vwc = true;
    --- a/drivers/nvme/host/nvme.h
    +++ b/drivers/nvme/host/nvme.h
    @@ -384,7 +384,6 @@ struct nvme_ns {
    #define NVME_NS_REMOVING 0
    #define NVME_NS_DEAD 1
    #define NVME_NS_ANA_PENDING 2
    - u16 noiob;

    struct nvme_fault_inject fault_inject;


    \
     
     \ /
      Last update: 2020-10-05 17:31    [W:4.032 / U:1.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site