Commit 815a76b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.8-2024-02-01' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - NVMe pull request via Keith:
     - Remove duplicated enums (Guixen)
     - Use appropriate controller state accessors (Keith)
     - Retryable authentication (Hannes)
     - Add missing module descriptions (Chaitanya)
     - Fibre-channel fixes for blktests (Daniel)
     - Various type correctness updates (Caleb)
     - Improve fabrics connection debugging prints (Nitin)
     - Passthrough command verbose error logging (Adam)

 - Fix for where we set IO priority in the bio for drivers that use
   fops->submit_bio() to queue IO, like md/dm etc.

* tag 'block-6.8-2024-02-01' of git://git.kernel.dk/linux: (32 commits)
  block: Fix where bio IO priority gets set
  nvme: allow passthru cmd error logging
  nvme-fc: show hostnqn when connecting to fc target
  nvme-rdma: show hostnqn when connecting to rdma target
  nvme-tcp: show hostnqn when connecting to tcp target
  nvmet-fc: use RCU list iterator for assoc_list
  nvmet-fc: take ref count on tgtport before delete assoc
  nvmet-fc: avoid deadlock on delete association path
  nvmet-fc: abort command when there is no binding
  nvmet-fc: do not tack refs on tgtports from assoc
  nvmet-fc: remove null hostport pointer check
  nvmet-fc: hold reference on hostport match
  nvmet-fc: free queue and assoc directly
  nvmet-fc: defer cleanup using RCU properly
  nvmet-fc: release reference on target port
  nvmet-fcloop: swap the list_add_tail arguments
  nvme-fc: do not wait in vain when unloading module
  nvme-fc: log human-readable opcode on timeout
  nvme: split out fabrics version of nvme_opcode_str()
  nvme: take const cmd pointer in read-only helpers
  ...
parents 717ca0b8 f3c89983

block/blk-core.c

+10 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include "blk-pm.h"

#include "blk-cgroup.h"

#include "blk-throttle.h"

#include "blk-ioprio.h"



struct dentry *blk_debugfs_root;
@@ -833,6 +834,14 @@ void submit_bio_noacct(struct bio *bio) 
}

EXPORT_SYMBOL(submit_bio_noacct);



static void bio_set_ioprio(struct bio *bio)

{

	/* Nobody set ioprio so far? Initialize it based on task's nice value */

	if (IOPRIO_PRIO_CLASS(bio->bi_ioprio) == IOPRIO_CLASS_NONE)

		bio->bi_ioprio = get_current_ioprio();

	blkcg_set_ioprio(bio);

}



/**

 * submit_bio - submit a bio to the block device layer for I/O

 * @bio: The &struct bio which describes the I/O
@@ -855,6 +864,7 @@ void submit_bio(struct bio *bio) 
		count_vm_events(PGPGOUT, bio_sectors(bio));

	}



	bio_set_ioprio(bio);

	submit_bio_noacct(bio);

}

EXPORT_SYMBOL(submit_bio);

block/blk-mq.c

+0 −10
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include "blk-stat.h"

#include "blk-mq-sched.h"

#include "blk-rq-qos.h"

#include "blk-ioprio.h"



static DEFINE_PER_CPU(struct llist_head, blk_cpu_done);

static DEFINE_PER_CPU(call_single_data_t, blk_cpu_csd);
@@ -2944,14 +2943,6 @@ static bool blk_mq_use_cached_rq(struct request *rq, struct blk_plug *plug, 
	return true;

}



static void bio_set_ioprio(struct bio *bio)

{

	/* Nobody set ioprio so far? Initialize it based on task's nice value */

	if (IOPRIO_PRIO_CLASS(bio->bi_ioprio) == IOPRIO_CLASS_NONE)

		bio->bi_ioprio = get_current_ioprio();

	blkcg_set_ioprio(bio);

}



/**

 * blk_mq_submit_bio - Create and send a request to block device.

 * @bio: Bio pointer.
@@ -2976,7 +2967,6 @@ void blk_mq_submit_bio(struct bio *bio) 
	blk_status_t ret;



	bio = blk_queue_bounce(bio, q);

	bio_set_ioprio(bio);



	if (plug) {

		rq = rq_list_peek(&plug->cached_rq);

drivers/nvme/common/auth.c

+1 −0
Original line number Diff line number Diff line
@@ -471,4 +471,5 @@ int nvme_auth_generate_key(u8 *secret, struct nvme_dhchap_key **ret_key) 
}

EXPORT_SYMBOL_GPL(nvme_auth_generate_key);



MODULE_DESCRIPTION("NVMe Authentication framework");

MODULE_LICENSE("GPL v2");

drivers/nvme/common/keyring.c

+1 −0
Original line number Diff line number Diff line
@@ -181,5 +181,6 @@ static void __exit nvme_keyring_exit(void) 


MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Hannes Reinecke <hare@suse.de>");

MODULE_DESCRIPTION("NVMe Keyring implementation");

module_init(nvme_keyring_init);

module_exit(nvme_keyring_exit);

drivers/nvme/host/apple.c

+7 −6
Original line number Diff line number Diff line
@@ -797,6 +797,7 @@ static int apple_nvme_init_request(struct blk_mq_tag_set *set, 


static void apple_nvme_disable(struct apple_nvme *anv, bool shutdown)

{

	enum nvme_ctrl_state state = nvme_ctrl_state(&anv->ctrl);

	u32 csts = readl(anv->mmio_nvme + NVME_REG_CSTS);

	bool dead = false, freeze = false;

	unsigned long flags;
@@ -808,8 +809,8 @@ static void apple_nvme_disable(struct apple_nvme *anv, bool shutdown) 
	if (csts & NVME_CSTS_CFS)

		dead = true;



	if (anv->ctrl.state == NVME_CTRL_LIVE ||

	    anv->ctrl.state == NVME_CTRL_RESETTING) {

	if (state == NVME_CTRL_LIVE ||

	    state == NVME_CTRL_RESETTING) {

		freeze = true;

		nvme_start_freeze(&anv->ctrl);

	}
@@ -881,7 +882,7 @@ static enum blk_eh_timer_return apple_nvme_timeout(struct request *req) 
	unsigned long flags;

	u32 csts = readl(anv->mmio_nvme + NVME_REG_CSTS);



	if (anv->ctrl.state != NVME_CTRL_LIVE) {

	if (nvme_ctrl_state(&anv->ctrl) != NVME_CTRL_LIVE) {

		/*

		 * From rdma.c:

		 * If we are resetting, connecting or deleting we should
@@ -985,10 +986,10 @@ static void apple_nvme_reset_work(struct work_struct *work) 
	u32 boot_status, aqa;

	struct apple_nvme *anv =

		container_of(work, struct apple_nvme, ctrl.reset_work);

	enum nvme_ctrl_state state = nvme_ctrl_state(&anv->ctrl);



	if (anv->ctrl.state != NVME_CTRL_RESETTING) {

		dev_warn(anv->dev, "ctrl state %d is not RESETTING\n",

			 anv->ctrl.state);

	if (state != NVME_CTRL_RESETTING) {

		dev_warn(anv->dev, "ctrl state %d is not RESETTING\n", state);

		ret = -ENODEV;

		goto out;

	}