Commit 3ab6608e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.12-2021-02-27' of git://git.kernel.dk/linux-block 

Pull more block updates from Jens Axboe:
 "A few stragglers (and one due to me missing it originally), and fixes
  for changes in this merge window mostly. In particular:

   - blktrace cleanups (Chaitanya, Greg)

   - Kill dead blk_pm_* functions (Bart)

   - Fixes for the bio alloc changes (Christoph)

   - Fix for the partition changes (Christoph, Ming)

   - Fix for turning off iopoll with polled IO inflight (Jeffle)

   - nbd disconnect fix (Josef)

   - loop fsync error fix (Mauricio)

   - kyber update depth fix (Yang)

   - max_sectors alignment fix (Mikulas)

   - Add bio_max_segs helper (Matthew)"

* tag 'block-5.12-2021-02-27' of git://git.kernel.dk/linux-block: (21 commits)
  block: Add bio_max_segs
  blktrace: fix documentation for blk_fill_rw()
  block: memory allocations in bounce_clone_bio must not fail
  block: remove the gfp_mask argument to bounce_clone_bio
  block: fix bounce_clone_bio for passthrough bios
  block-crypto-fallback: use a bio_set for splitting bios
  block: fix logging on capacity change
  blk-settings: align max_sectors on "logical_block_size" boundary
  block: reopen the device in blkdev_reread_part
  block: don't skip empty device in in disk_uevent
  blktrace: remove debugfs file dentries from struct blk_trace
  nbd: handle device refs for DESTROY_ON_DISCONNECT properly
  kyber: introduce kyber_depth_updated()
  loop: fix I/O error on fsync() in detached loop devices
  block: fix potential IO hang when turning off io_poll
  block: get rid of the trace rq insert wrapper
  blktrace: fix blk_rq_merge documentation
  blktrace: fix blk_rq_issue documentation
  blktrace: add blk_fill_rwbs documentation comment
  block: remove superfluous param in blk_fill_rwbs()
  ...
parents 5695e516 5f7136db

block/bfq-iosched.c

+3 −1
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ 
#include <linux/delay.h>

#include <linux/backing-dev.h>



#include <trace/events/block.h>



#include "blk.h"

#include "blk-mq.h"

#include "blk-mq-tag.h"
@@ -5621,7 +5623,7 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, 


	spin_unlock_irq(&bfqd->lock);



	blk_mq_sched_request_inserted(rq);

	trace_block_rq_insert(rq);



	spin_lock_irq(&bfqd->lock);

	bfqq = bfq_init_rq(rq);

block/blk-core.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap); 
EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete);

EXPORT_TRACEPOINT_SYMBOL_GPL(block_split);

EXPORT_TRACEPOINT_SYMBOL_GPL(block_unplug);

EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_insert);



DEFINE_IDA(blk_queue_ida);

block/blk-crypto-fallback.c

+10 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static struct blk_crypto_keyslot { 
static struct blk_keyslot_manager blk_crypto_ksm;

static struct workqueue_struct *blk_crypto_wq;

static mempool_t *blk_crypto_bounce_page_pool;

static struct bio_set crypto_bio_split;



/*

 * This is the key we set when evicting a keyslot. This *should* be the all 0's
@@ -224,7 +225,8 @@ static bool blk_crypto_split_bio_if_needed(struct bio **bio_ptr) 
	if (num_sectors < bio_sectors(bio)) {

		struct bio *split_bio;



		split_bio = bio_split(bio, num_sectors, GFP_NOIO, NULL);

		split_bio = bio_split(bio, num_sectors, GFP_NOIO,

				      &crypto_bio_split);

		if (!split_bio) {

			bio->bi_status = BLK_STS_RESOURCE;

			return false;
@@ -538,9 +540,13 @@ static int blk_crypto_fallback_init(void) 


	prandom_bytes(blank_key, BLK_CRYPTO_MAX_KEY_SIZE);



	err = blk_ksm_init(&blk_crypto_ksm, blk_crypto_num_keyslots);

	err = bioset_init(&crypto_bio_split, 64, 0, 0);

	if (err)

		goto out;



	err = blk_ksm_init(&blk_crypto_ksm, blk_crypto_num_keyslots);

	if (err)

		goto fail_free_bioset;

	err = -ENOMEM;



	blk_crypto_ksm.ksm_ll_ops = blk_crypto_ksm_ll_ops;
@@ -591,6 +597,8 @@ static int blk_crypto_fallback_init(void) 
	destroy_workqueue(blk_crypto_wq);

fail_free_ksm:

	blk_ksm_destroy(&blk_crypto_ksm);

fail_free_bioset:

	bioset_exit(&crypto_bio_split);

out:

	return err;

}

block/blk-map.c

+1 −3
Original line number Diff line number Diff line
@@ -150,9 +150,7 @@ static int bio_copy_user_iov(struct request *rq, struct rq_map_data *map_data, 
	bmd->is_our_pages = !map_data;

	bmd->is_null_mapped = (map_data && map_data->null_mapped);



	nr_pages = DIV_ROUND_UP(offset + len, PAGE_SIZE);

	if (nr_pages > BIO_MAX_PAGES)

		nr_pages = BIO_MAX_PAGES;

	nr_pages = bio_max_segs(DIV_ROUND_UP(offset + len, PAGE_SIZE));



	ret = -ENOMEM;

	bio = bio_kmalloc(gfp_mask, nr_pages);

block/blk-mq-sched.c

+0 −6
Original line number Diff line number Diff line
@@ -384,12 +384,6 @@ bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq) 
}

EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge);



void blk_mq_sched_request_inserted(struct request *rq)

{

	trace_block_rq_insert(rq);

}

EXPORT_SYMBOL_GPL(blk_mq_sched_request_inserted);



static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx,

				       bool has_sched,

				       struct request *rq)