Commit c41c3ec4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-5.9-2020-08-23' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - NVMe pull request from Sagi:
       - nvme completion rework from Christoph and Chao that mostly came
         from a bit of divergence of how we classify errors related to
         pathing/retry etc.
       - nvmet passthru fixes from Chaitanya
       - minor nvmet fixes from Amit and I
       - mpath round-robin path selection fix from Martin
       - ignore noiob for zoned devices from Keith
       - minor nvme-fc fix from Tianjia"

 - BFQ cgroup leak fix (Dmitry)

 - block layer MAINTAINERS addition (Geert)

 - fix null_blk FUA checking (Hou)

 - get_max_io_size() size fix (Keith)

 - fix block page_is_mergeable() for compound pages (Matthew)

 - discard granularity fixes (Ming)

 - IO scheduler ordering fix (Ming)

 - misc fixes

* tag 'io_uring-5.9-2020-08-23' of git://git.kernel.dk/linux-block: (31 commits)
  null_blk: fix passing of REQ_FUA flag in null_handle_rq
  nvmet: Disable keep-alive timer when kato is cleared to 0h
  nvme: redirect commands on dying queue
  nvme: just check the status code type in nvme_is_path_error
  nvme: refactor command completion
  nvme: rename and document nvme_end_request
  nvme: skip noiob for zoned devices
  nvme-pci: fix PRP pool size
  nvme-pci: Use u32 for nvme_dev.q_depth and nvme_queue.q_depth
  nvme: Use spin_lock_irq() when taking the ctrl->lock
  nvmet: call blk_mq_free_request() directly
  nvmet: fix oops in pt cmd execution
  nvmet: add ns tear down label for pt-cmd handling
  nvme: multipath: round-robin: eliminate "fallback" variable
  nvme: multipath: round-robin: fix single non-optimized path case
  nvme-fc: Fix wrong return value in __nvme_fc_init_request()
  nvmet-passthru: Reject commands with non-sgl flags set
  nvmet: fix a memory leak
  blkcg: fix memleak for iolatency
  MAINTAINERS: Add missing header files to BLOCK LAYER section
  ...
parents 2bf74771 2d62e6b0

Documentation/fault-injection/nvme-fault-injection.rst

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ NVMe Fault Injection 
Linux's fault injection framework provides a systematic way to support

error injection via debugfs in the /sys/kernel/debug directory. When

enabled, the default NVME_SC_INVALID_OPCODE with no retry will be

injected into the nvme_end_request. Users can change the default status

injected into the nvme_try_complete_req. Users can change the default status

code and no retry flag via the debugfs. The list of Generic Command

Status can be found in include/linux/nvme.h

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3205,6 +3205,7 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git

F:	block/

F:	drivers/block/

F:	include/linux/blk*

F:	kernel/trace/blktrace.c

F:	lib/sbitmap.c
































block/bfq-cgroup.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -332,7 +332,7 @@ static void bfqg_put(struct bfq_group *bfqg)







		kfree(bfqg);









}



















void bfqg_and_blkg_get(struct bfq_group *bfqg)









static void bfqg_and_blkg_get(struct bfq_group *bfqg)









{









	/* see comments in bfq_bic_update_cgroup for why refcounting bfqg */









	bfqg_get(bfqg);
































block/bfq-iosched.h



+0
−1






























Original line number
Diff line number
Diff line







@@ -986,7 +986,6 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,







struct blkcg_gq *bfqg_to_blkg(struct bfq_group *bfqg);









struct bfq_group *bfqq_group(struct bfq_queue *bfqq);









struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node);









void bfqg_and_blkg_get(struct bfq_group *bfqg);









void bfqg_and_blkg_put(struct bfq_group *bfqg);



















#ifdef CONFIG_BFQ_GROUP_IOSCHED
































block/bfq-wf2q.c



+2
−10






























Original line number
Diff line number
Diff line







@@ -533,9 +533,7 @@ static void bfq_get_entity(struct bfq_entity *entity)







		bfqq->ref++;









		bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d",









			     bfqq, bfqq->ref);









	} else









		bfqg_and_blkg_get(container_of(entity, struct bfq_group,









					       entity));









	}









}



















/**








@@ -649,14 +647,8 @@ static void bfq_forget_entity(struct bfq_service_tree *st,

















	entity->on_st_or_in_serv = false;









	st->wsum -= entity->weight;









	if (is_in_service)









		return;



















	if (bfqq)









	if (bfqq && !is_in_service)









		bfq_put_queue(bfqq);









	else









		bfqg_and_blkg_put(container_of(entity, struct bfq_group,









					       entity));









}



















/**








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE