Hi Linus,
Sitting on top of the core block changes, here are the driver changes
for the 5.15 merge window:
- NVMe updates via Christoph:
- suspend improvements for devices with an HMB (Keith Busch)
- handle double completions more gacefull (Sagi Grimberg)
- cleanup the selects for the nvme core code a bit
(Sagi Grimberg)
- don't update queue count when failing to set io queues
(Ruozhu Li)
- various nvmet connect fixes (Amit Engel)
- cleanup lightnvm leftovers (Keith Busch, me)
- small cleanups (Colin Ian King, Hou Pu)
- add tracing for the Set Features command (Hou Pu)
- CMB sysfs cleanups (Keith Busch)
- add a mutex_destroy call (Keith Busch)
- Remove lightnvm subsystem. It's served its purpose and ultimately led
to zoned nvme support, we no longer need it (Christoph)
- Revert floppy O_NDELAY fix (Denis)
- nbd fixes (Hou, Pavel, Baokun)
- nbd locking fixes (Tetsuo)
- nbd device removal fixes (Christoph)
- raid10 rcu warning fix (Xiao)
- raid1 write behind fix (Guoqing)
- rnbd fixes (Gioh, Md Haris)
- Misc fixes (Colin)
Note that this will throw a single merge conflict, due to lightnvm being
removed. The resolution is simple:
diff --cc drivers/nvme/host/core.c
index 68acd33c3856,b9a46c54f714..8679a108f571
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@@ -3758,17 -3757,11 +3753,10 @@@ static void nvme_alloc_ns(struct nvme_c
if (!nvme_mpath_set_disk_name(ns, disk->disk_name, &disk->flags))
sprintf(disk->disk_name, "nvme%dn%d", ctrl->instance,
ns->head->instance);
- ns->disk = disk;
if (nvme_update_ns_info(ns, id))
- goto out_put_disk;
+ goto out_unlink_ns;
- if ((ctrl->quirks & NVME_QUIRK_LIGHTNVM) && id->vs[0] == 0x1) {
- if (nvme_nvm_register(ns, disk->disk_name, node)) {
- dev_warn(ctrl->device, "LightNVM init failure\n");
- goto out_unlink_ns;
- }
- }
-
down_write(&ctrl->namespaces_rwsem);
list_add_tail(&ns->list, &ctrl->namespaces);
up_write(&ctrl->namespaces_rwsem);
Apart from that, merges cleanly. Please pull!
The following changes since commit 2bc1f6e442eec88fa60f1ee6bef2c9871227cf8a:
block: remove blk-mq-sysfs dead code (2021-08-02 13:37:29 -0600)
are available in the Git repository at:
git://git.kernel.dk/linux-block.git tags/for-5.15/drivers-2021-08-30
for you to fetch changes up to b5b0eba590f08e2b06c830b8343c1da7059c7a88:
Merge tag 'floppy-for-5.15' of https://github.com/evdenis/linux-floppy into for-5.15/drivers (2021-08-29 06:50:58 -0600)
----------------------------------------------------------------
for-5.15/drivers-2021-08-30
----------------------------------------------------------------
Amit Engel (3):
nvmet: pass back cntlid on successful completion
nvmet: avoid duplicate qid in connect cmd
nvmet: check that host sqsize does not exceed ctrl MQES
Baokun Li (1):
nbd: add the check to prevent overflow in __nbd_ioctl()
Christoph Hellwig (10):
nbd: refactor device removal
nbd: remove nbd_del_disk
nbd: return the allocated nbd_device from nbd_dev_add
nbd: refactor device search and allocation in nbd_genl_connect
nbd: reduce the nbd_index_mutex scope
remove the lightnvm subsystem
nvme: remove the unused NVME_NS_* enum
nbd: reset NBD to NULL when restarting in nbd_genl_connect
nbd: only return usable devices from nbd_find_unused
nbd: remove nbd->destroy_complete
Colin Ian King (2):
xen-blkfront: Remove redundant assignment to variable err
nvmet: remove redundant assignments of variable status
Denis Efremov (1):
Revert "floppy: reintroduce O_NDELAY fix"
Gioh Kim (1):
block/rnbd-clt: Use put_cpu_ptr after get_cpu_ptr
Guoqing Jiang (1):
raid1: ensure write behind bio has less than BIO_MAX_VECS sectors
Hou Pu (3):
nvme-fabrics: remove superfluous nvmf_host_put in nvmf_parse_options
nvme: add set feature tracing support
nvmet: add set feature tracing support
Hou Tao (1):
nbd: do del_gendisk() asynchronously for NBD_DESTROY_ON_DISCONNECT
Jens Axboe (3):
Merge tag 'nvme-5.15-2021-08-18' of git://git.infradead.org/nvme into for-5.15/drivers
Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.15/drivers
Merge tag 'floppy-for-5.15' of https://github.com/evdenis/linux-floppy into for-5.15/drivers
Keith Busch (6):
nvme-pci: use attribute group for cmb sysfs
nvme-pci: cmb sysfs: one file, one value
nvme-pci: disable hmb on idle suspend
nvme: allow user toggling hmb usage
nvme-tcp: pair send_mutex init with destroy
nvme: remove nvm_ndev from ns
Md Haris Iqbal (1):
block/rnbd: Use sysfs_emit instead of s*printf function for sysfs show
Pavel Skripkin (1):
block: nbd: add sanity check for first_minor
Ruozhu Li (2):
nvme-tcp: don't update queue count when failing to set io queues
nvme-rdma: don't update queue count when failing to set io queues
Sagi Grimberg (5):
params: lift param_set_uint_minmax to common code
nvme-pci: limit maximum queue depth to 4095
nvme-tcp: don't check blk_mq_tag_to_rq when receiving pdu data
nvme: code command_id with a genctr for use-after-free validation
nvme: Have NVME_FABRICS select NVME_CORE instead of transport drivers
Tetsuo Handa (3):
nbd: add missing locking to the nbd_dev_add error path
nbd: prevent IDR lookups from finding partially initialized devices
nbd: set nbd->index before releasing nbd_index_mutex
Xiao Ni (1):
md/raid10: Remove unnecessary rcu_dereference in raid10_handle_discard
Documentation/driver-api/index.rst | 1 -
Documentation/driver-api/lightnvm-pblk.rst | 21 -
Documentation/userspace-api/ioctl/ioctl-number.rst | 1 -
MAINTAINERS | 9 -
drivers/Kconfig | 2 -
drivers/Makefile | 1 -
drivers/block/floppy.c | 30 +-
drivers/block/nbd.c | 178 +-
drivers/block/rnbd/rnbd-clt-sysfs.c | 33 +-
drivers/block/rnbd/rnbd-clt.c | 2 +-
drivers/block/rnbd/rnbd-srv-sysfs.c | 14 +-
drivers/block/xen-blkfront.c | 1 -
drivers/lightnvm/Kconfig | 44 -
drivers/lightnvm/Makefile | 11 -
drivers/lightnvm/core.c | 1440 -------------
drivers/lightnvm/pblk-cache.c | 137 --
drivers/lightnvm/pblk-core.c | 2151 --------------------
drivers/lightnvm/pblk-gc.c | 726 -------
drivers/lightnvm/pblk-init.c | 1324 ------------
drivers/lightnvm/pblk-map.c | 210 --
drivers/lightnvm/pblk-rb.c | 858 --------
drivers/lightnvm/pblk-read.c | 474 -----
drivers/lightnvm/pblk-recovery.c | 874 --------
drivers/lightnvm/pblk-rl.c | 254 ---
drivers/lightnvm/pblk-sysfs.c | 728 -------
drivers/lightnvm/pblk-trace.h | 145 --
drivers/lightnvm/pblk-write.c | 665 ------
drivers/lightnvm/pblk.h | 1358 ------------
drivers/md/raid1.c | 19 +
drivers/md/raid10.c | 14 +-
drivers/nvme/host/Kconfig | 4 +-
drivers/nvme/host/Makefile | 1 -
drivers/nvme/host/core.c | 16 +-
drivers/nvme/host/fabrics.c | 1 -
drivers/nvme/host/ioctl.c | 4 +-
drivers/nvme/host/lightnvm.c | 1274 ------------
drivers/nvme/host/nvme.h | 79 +-
drivers/nvme/host/pci.c | 187 +-
drivers/nvme/host/rdma.c | 8 +-
drivers/nvme/host/tcp.c | 44 +-
drivers/nvme/host/trace.c | 18 +-
drivers/nvme/target/Kconfig | 2 -
drivers/nvme/target/core.c | 1 +
drivers/nvme/target/fabrics-cmd.c | 38 +-
drivers/nvme/target/loop.c | 4 +-
drivers/nvme/target/trace.c | 18 +-
drivers/nvme/target/zns.c | 5 +-
include/linux/lightnvm.h | 697 -------
include/linux/moduleparam.h | 2 +
include/uapi/linux/lightnvm.h | 224 --
kernel/params.c | 18 +
net/sunrpc/xprtsock.c | 18 -
52 files changed, 462 insertions(+), 13926 deletions(-)
delete mode 100644 Documentation/driver-api/lightnvm-pblk.rst
delete mode 100644 drivers/lightnvm/Kconfig
delete mode 100644 drivers/lightnvm/Makefile
delete mode 100644 drivers/lightnvm/core.c
delete mode 100644 drivers/lightnvm/pblk-cache.c
delete mode 100644 drivers/lightnvm/pblk-core.c
delete mode 100644 drivers/lightnvm/pblk-gc.c
delete mode 100644 drivers/lightnvm/pblk-init.c
delete mode 100644 drivers/lightnvm/pblk-map.c
delete mode 100644 drivers/lightnvm/pblk-rb.c
delete mode 100644 drivers/lightnvm/pblk-read.c
delete mode 100644 drivers/lightnvm/pblk-recovery.c
delete mode 100644 drivers/lightnvm/pblk-rl.c
delete mode 100644 drivers/lightnvm/pblk-sysfs.c
delete mode 100644 drivers/lightnvm/pblk-trace.h
delete mode 100644 drivers/lightnvm/pblk-write.c
delete mode 100644 drivers/lightnvm/pblk.h
delete mode 100644 drivers/nvme/host/lightnvm.c
delete mode 100644 include/linux/lightnvm.h
delete mode 100644 include/uapi/linux/lightnvm.h
--
Jens Axboe
