Commit 736feaa3 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-6.1/block' into for-6.1/passthrough 



* for-6.1/block: (162 commits)
  sbitmap: fix lockup while swapping
  block: add rationale for not using blk_mq_plug() when applicable
  block: adapt blk_mq_plug() to not plug for writes that require a zone lock
  s390/dasd: use blk_mq_alloc_disk
  blk-cgroup: don't update the blkg lookup hint in blkg_conf_prep
  nvmet: don't look at the request_queue in nvmet_bdev_set_limits
  nvmet: don't look at the request_queue in nvmet_bdev_zone_mgmt_emulate_all
  blk-mq: use quiesced elevator switch when reinitializing queues
  block: replace blk_queue_nowait with bdev_nowait
  nvme: remove nvme_ctrl_init_connect_q
  nvme-loop: use the tagset alloc/free helpers
  nvme-loop: store the generic nvme_ctrl in set->driver_data
  nvme-loop: initialize sqsize later
  nvme-fc: use the tagset alloc/free helpers
  nvme-fc: store the generic nvme_ctrl in set->driver_data
  nvme-fc: keep ctrl->sqsize in sync with opts->queue_size
  nvme-rdma: use the tagset alloc/free helpers
  nvme-rdma: store the generic nvme_ctrl in set->driver_data
  nvme-tcp: use the tagset alloc/free helpers
  nvme-tcp: store the generic nvme_ctrl in set->driver_data
  ...

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parents f76349cf 30514bd2

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -14547,6 +14547,15 @@ F: drivers/nvme/common/ 
F:	include/linux/nvme*

F:	include/uapi/linux/nvme_ioctl.h









NVM EXPRESS FABRICS AUTHENTICATION









M:	Hannes Reinecke <hare@suse.de>









L:	linux-nvme@lists.infradead.org









S:	Supported









F:	drivers/nvme/host/auth.c









F:	drivers/nvme/target/auth.c









F:	drivers/nvme/target/fabrics-cmd-auth.c









F:	include/linux/nvme-auth.h

















NVM EXPRESS FC TRANSPORT DRIVERS









M:	James Smart <james.smart@broadcom.com>









L:	linux-nvme@lists.infradead.org
































arch/s390/include/asm/scsw.h



+5
−0






























Original line number
Diff line number
Diff line







@@ -215,6 +215,11 @@ union scsw {







#define SNS2_ENV_DATA_PRESENT	0x10









#define SNS2_INPRECISE_END	0x04



















/*









 * architectured values for PPRC errors









 */









#define SNS7_INVALID_ON_SEC	0x0e



















/**









 * scsw_is_tm - check for transport mode scsw









 * @scsw: pointer to scsw
































arch/s390/include/uapi/asm/dasd.h



+14
−0






























Original line number
Diff line number
Diff line







@@ -182,6 +182,18 @@ typedef struct format_data_t {







	unsigned int intensity;









} format_data_t;



















/*









 * struct dasd_copypair_swap_data_t









 * represents all data necessary to issue a swap of the copy pair relation









 */









struct dasd_copypair_swap_data_t {









	char primary[20]; /* BUSID of primary */









	char secondary[20]; /* BUSID of secondary */



















	/* Reserved for future updates. */









	__u8 reserved[64];









};



















/*









 * values to be used for format_data_t.intensity









 * 0/8: normal format








@@ -326,6 +338,8 @@ struct dasd_snid_ioctl_data {







#define BIODASDSATTR   _IOW(DASD_IOCTL_LETTER,2,attrib_data_t)









/* Release Allocated Space */









#define BIODASDRAS     _IOW(DASD_IOCTL_LETTER, 3, format_data_t)









/* Swap copy pair relation */









#define BIODASDCOPYPAIRSWAP _IOW(DASD_IOCTL_LETTER, 4, struct dasd_copypair_swap_data_t)



















/* Get Sense Path Group ID (SNID) data */









#define BIODASDSNID    _IOWR(DASD_IOCTL_LETTER, 1, struct dasd_snid_ioctl_data)
































block/bfq-cgroup.c



+0
−5






























Original line number
Diff line number
Diff line







@@ -254,17 +254,12 @@ void bfqg_stats_update_completion(struct bfq_group *bfqg, u64 start_time_ns,

















#else /* CONFIG_BFQ_CGROUP_DEBUG */



















void bfqg_stats_update_io_add(struct bfq_group *bfqg, struct bfq_queue *bfqq,









			      blk_opf_t opf) { }









void bfqg_stats_update_io_remove(struct bfq_group *bfqg, blk_opf_t opf) { }









void bfqg_stats_update_io_merged(struct bfq_group *bfqg, blk_opf_t opf) { }









void bfqg_stats_update_completion(struct bfq_group *bfqg, u64 start_time_ns,









				  u64 io_start_time_ns, blk_opf_t opf) { }









void bfqg_stats_update_dequeue(struct bfq_group *bfqg) { }









void bfqg_stats_set_start_empty_time(struct bfq_group *bfqg) { }









void bfqg_stats_update_idle_time(struct bfq_group *bfqg) { }









void bfqg_stats_set_start_idle_time(struct bfq_group *bfqg) { }









void bfqg_stats_update_avg_queue_size(struct bfq_group *bfqg) { }



















#endif /* CONFIG_BFQ_CGROUP_DEBUG */










































block/bfq-iosched.c



+6
−8






























Original line number
Diff line number
Diff line







@@ -1925,7 +1925,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd,







	bfqq->service_from_backlogged = 0;









	bfq_clear_bfqq_softrt_update(bfqq);



















	bfq_add_bfqq_busy(bfqd, bfqq);









	bfq_add_bfqq_busy(bfqq);



















	/*









	 * Expire in-service queue if preemption may be needed for








@@ -2419,7 +2419,7 @@ static void bfq_remove_request(struct request_queue *q,







		bfqq->next_rq = NULL;



















		if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue) {









			bfq_del_bfqq_busy(bfqd, bfqq, false);









			bfq_del_bfqq_busy(bfqq, false);









			/*









			 * bfqq emptied. In normal operation, when









			 * bfqq is empty, bfqq->entity.service and








@@ -3098,7 +3098,7 @@ void bfq_release_process_ref(struct bfq_data *bfqd, struct bfq_queue *bfqq)







	 */









	if (bfq_bfqq_busy(bfqq) && RB_EMPTY_ROOT(&bfqq->sort_list) &&









	    bfqq != bfqd->in_service_queue)









		bfq_del_bfqq_busy(bfqd, bfqq, false);









		bfq_del_bfqq_busy(bfqq, false);



















	bfq_reassign_last_bfqq(bfqq, NULL);


















@@ -3908,7 +3908,7 @@ static bool __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq,







			 */









			bfqq->budget_timeout = jiffies;



















		bfq_del_bfqq_busy(bfqd, bfqq, true);









		bfq_del_bfqq_busy(bfqq, true);









	} else {









		bfq_requeue_bfqq(bfqd, bfqq, true);









		/*








@@ -5255,9 +5255,7 @@ void bfq_put_queue(struct bfq_queue *bfqq)







	struct hlist_node *n;









	struct bfq_group *bfqg = bfqq_group(bfqq);



















	if (bfqq->bfqd)









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









			     bfqq, bfqq->ref);









	bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p %d", bfqq, bfqq->ref);



















	bfqq->ref--;









	if (bfqq->ref)








@@ -5321,7 +5319,7 @@ void bfq_put_queue(struct bfq_queue *bfqq)







		hlist_del_init(&item->woken_list_node);









	}



















	if (bfqq->bfqd && bfqq->bfqd->last_completed_rq_bfqq == bfqq)









	if (bfqq->bfqd->last_completed_rq_bfqq == bfqq)









		bfqq->bfqd->last_completed_rq_bfqq = NULL;



















	kmem_cache_free(bfq_pool, bfqq);