From: Linus Torvalds Date: Tue, 14 Nov 2017 23:32:19 +0000 (-0800) Subject: Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block X-Git-Tag: v4.19~2212 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2c5923c349c1738fe8fda980874d93f6fb2e5b6;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block Pull core block layer updates from Jens Axboe: "This is the main pull request for block storage for 4.15-rc1. Nothing out of the ordinary in here, and no API changes or anything like that. Just various new features for drivers, core changes, etc. In particular, this pull request contains: - A patch series from Bart, closing the whole on blk/scsi-mq queue quescing. - A series from Christoph, building towards hidden gendisks (for multipath) and ability to move bio chains around. - NVMe - Support for native multipath for NVMe (Christoph). - Userspace notifications for AENs (Keith). - Command side-effects support (Keith). - SGL support (Chaitanya Kulkarni) - FC fixes and improvements (James Smart) - Lots of fixes and tweaks (Various) - bcache - New maintainer (Michael Lyle) - Writeback control improvements (Michael) - Various fixes (Coly, Elena, Eric, Liang, et al) - lightnvm updates, mostly centered around the pblk interface (Javier, Hans, and Rakesh). - Removal of unused bio/bvec kmap atomic interfaces (me, Christoph) - Writeback series that fix the much discussed hundreds of millions of sync-all units. This goes all the way, as discussed previously (me). - Fix for missing wakeup on writeback timer adjustments (Yafang Shao). - Fix laptop mode on blk-mq (me). - {mq,name} tupple lookup for IO schedulers, allowing us to have alias names. This means you can use 'deadline' on both !mq and on mq (where it's called mq-deadline). (me). - blktrace race fix, oopsing on sg load (me). - blk-mq optimizations (me). - Obscure waitqueue race fix for kyber (Omar). - NBD fixes (Josef). - Disable writeback throttling by default on bfq, like we do on cfq (Luca Miccio). - Series from Ming that enable us to treat flush requests on blk-mq like any other request. This is a really nice cleanup. - Series from Ming that improves merging on blk-mq with schedulers, getting us closer to flipping the switch on scsi-mq again. - BFQ updates (Paolo). - blk-mq atomic flags memory ordering fixes (Peter Z). - Loop cgroup support (Shaohua). - Lots of minor fixes from lots of different folks, both for core and driver code" * 'for-4.15/block' of git://git.kernel.dk/linux-block: (294 commits) nvme: fix visibility of "uuid" ns attribute blk-mq: fixup some comment typos and lengths ide: ide-atapi: fix compile error with defining macro DEBUG blk-mq: improve tag waiting setup for non-shared tags brd: remove unused brd_mutex blk-mq: only run the hardware queue if IO is pending block: avoid null pointer dereference on null disk fs: guard_bio_eod() needs to consider partitions xtensa/simdisk: fix compile error nvme: expose subsys attribute to sysfs nvme: create 'slaves' and 'holders' entries for hidden controllers block: create 'slaves' and 'holders' entries for hidden gendisks nvme: also expose the namespace identification sysfs files for mpath nodes nvme: implement multipath access to nvme subsystems nvme: track shared namespaces nvme: introduce a nvme_ns_ids structure nvme: track subsystems block, nvme: Introduce blk_mq_req_flags_t block, scsi: Make SCSI quiesce and resume work reliably block: Add the QUEUE_FLAG_PREEMPT_ONLY request queue flag ... --- e2c5923c349c1738fe8fda980874d93f6fb2e5b6 diff --cc drivers/cdrom/Makefile index a95566f,7f3f43c..0f3664b --- a/drivers/cdrom/Makefile +++ b/drivers/cdrom/Makefile @@@ -1,14 -1,2 +1,3 @@@ +# SPDX-License-Identifier: GPL-2.0 - # Makefile for the kernel cdrom device drivers. - # - # 30 Jan 1998, Michael Elizabeth Chastain, - # Rewritten to use lists instead of if-statements. - - # Each configuration option enables a list of files. - - obj-$(CONFIG_BLK_DEV_IDECD) += cdrom.o - obj-$(CONFIG_BLK_DEV_SR) += cdrom.o - obj-$(CONFIG_PARIDE_PCD) += cdrom.o - obj-$(CONFIG_CDROM_PKTCDVD) += cdrom.o - - obj-$(CONFIG_GDROM) += gdrom.o cdrom.o + obj-$(CONFIG_CDROM) += cdrom.o + obj-$(CONFIG_GDROM) += gdrom.o diff --cc drivers/nvme/host/core.c index 37f9039,993813c..25da74d --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@@ -1249,13 -1407,10 +1407,11 @@@ static int nvme_revalidate_disk(struct goto out; } + __nvme_revalidate_disk(disk, id); - nvme_report_ns_ids(ctrl, ns->ns_id, id, eui64, nguid, &uuid); - if (!uuid_equal(&ns->uuid, &uuid) || - memcmp(&ns->nguid, &nguid, sizeof(ns->nguid)) || - memcmp(&ns->eui, &eui64, sizeof(ns->eui))) { + nvme_report_ns_ids(ctrl, ns->head->ns_id, id, &ids); + if (!nvme_ns_ids_equal(&ns->head->ids, &ids)) { dev_err(ctrl->device, - "identifiers changed for nsid %d\n", ns->ns_id); + "identifiers changed for nsid %d\n", ns->head->ns_id); ret = -ENODEV; } diff --cc drivers/nvme/host/fc.c index be49d0f,6eb460b..7ab0be5 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@@ -2760,7 -3104,7 +3104,8 @@@ nvme_fc_init_ctrl(struct device *dev, s ctrl->rport = rport; ctrl->dev = lport->dev; ctrl->cnum = idx; + ctrl->assoc_active = false; + init_waitqueue_head(&ctrl->ioabort_wait); get_device(ctrl->dev); kref_init(&ctrl->ref); diff --cc drivers/nvme/host/rdma.c index 0ebb539,c8d8544..4f9bf2f --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@@ -568,15 -560,9 +560,15 @@@ static void nvme_rdma_stop_queue(struc static void nvme_rdma_free_queue(struct nvme_rdma_queue *queue) { - if (test_and_set_bit(NVME_RDMA_Q_DELETING, &queue->flags)) + if (!test_and_clear_bit(NVME_RDMA_Q_ALLOCATED, &queue->flags)) return; + if (nvme_rdma_queue_idx(queue) == 0) { + nvme_rdma_free_qe(queue->device->dev, + &queue->ctrl->async_event_sqe, + sizeof(struct nvme_command), DMA_TO_DEVICE); + } + nvme_rdma_destroy_queue_ib(queue); rdma_destroy_id(queue->cm_id); }