lkml.org 
[lkml]   [2020]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 034/112] nvme-multipath: set bdi capabilities once
    Date
    From: Keith Busch <kbusch@kernel.org>

    [ Upstream commit b2ce4d90690bd29ce5b554e203cd03682dd59697 ]

    The queues' backing device info capabilities don't change with each
    namespace revalidation. Set it only when each path's request_queue
    is initially added to a multipath queue.

    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: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/core.c | 7 -------
    drivers/nvme/host/multipath.c | 8 ++++++++
    2 files changed, 8 insertions(+), 7 deletions(-)

    diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
    index 7b4cbe2c69541..887139f8fa53b 100644
    --- a/drivers/nvme/host/core.c
    +++ b/drivers/nvme/host/core.c
    @@ -1910,13 +1910,6 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
    if (ns->head->disk) {
    nvme_update_disk_info(ns->head->disk, ns, id);
    blk_queue_stack_limits(ns->head->disk->queue, ns->queue);
    - if (bdi_cap_stable_pages_required(ns->queue->backing_dev_info)) {
    - struct backing_dev_info *info =
    - ns->head->disk->queue->backing_dev_info;
    -
    - info->capabilities |= BDI_CAP_STABLE_WRITES;
    - }
    -
    revalidate_disk(ns->head->disk);
    }
    #endif
    diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
    index 17f172cf456ad..91a8b1ce5a3a2 100644
    --- a/drivers/nvme/host/multipath.c
    +++ b/drivers/nvme/host/multipath.c
    @@ -3,6 +3,7 @@
    * Copyright (c) 2017-2018 Christoph Hellwig.
    */

    +#include <linux/backing-dev.h>
    #include <linux/moduleparam.h>
    #include <trace/events/block.h>
    #include "nvme.h"
    @@ -662,6 +663,13 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id)
    ns->ana_state = NVME_ANA_OPTIMIZED;
    nvme_mpath_set_live(ns);
    }
    +
    + if (bdi_cap_stable_pages_required(ns->queue->backing_dev_info)) {
    + struct backing_dev_info *info =
    + ns->head->disk->queue->backing_dev_info;
    +
    + info->capabilities |= BDI_CAP_STABLE_WRITES;
    + }
    }

    void nvme_mpath_remove_disk(struct nvme_ns_head *head)
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-07 18:10    [W:4.046 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site