Commit 47454caf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.12-2021-03-05' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - NVMe fixes:
      - more device quirks (Julian Einwag, Zoltán Böszörményi, Pascal
        Terjan)
      - fix a hwmon error return (Daniel Wagner)
      - fix the keep alive timeout initialization (Martin George)
      - ensure the model_number can't be changed on a used subsystem
        (Max Gurtovoy)

 - rsxx missing -EFAULT on copy_to_user() failure (Dan)

 - rsxx remove unused linux.h include (Tian)

 - kill unused RQF_SORTED (Jean)

 - updated outdated BFQ comments (Joseph)

 - revert work-around commit for bd_size_lock, since we removed the
   offending user in this merge window (Damien)

* tag 'block-5.12-2021-03-05' of git://git.kernel.dk/linux-block:
  nvmet: model_number must be immutable once set
  nvme-fabrics: fix kato initialization
  nvme-hwmon: Return error code when registration fails
  nvme-pci: add quirks for Lexar 256GB SSD
  nvme-pci: mark Kingston SKC2000 as not supporting the deepest power state
  nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST.
  rsxx: Return -EFAULT if copy_to_user() fails
  block/bfq: update comments and default value in docs for fifo_expire
  rsxx: remove unused including <linux/version.h>
  block: Drop leftover references to RQF_SORTED
  block: revert "block: fix bd_size_lock use"
parents f292e873 a2b658e4

Documentation/block/bfq-iosched.rst

+2 −2
Original line number Diff line number Diff line
@@ -430,13 +430,13 @@ fifo_expire_async 
-----------------



This parameter is used to set the timeout of asynchronous requests. Default

value of this is 248ms.

value of this is 250ms.



fifo_expire_sync

----------------



This parameter is used to set the timeout of synchronous requests. Default

value of this is 124ms. In case to favor synchronous requests over asynchronous

value of this is 125ms. In case to favor synchronous requests over asynchronous

one, this value should be decreased relative to fifo_expire_async.



low_latency

block/bfq-iosched.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ BFQ_BFQQ_FNS(split_coop); 
BFQ_BFQQ_FNS(softrt_update);

#undef BFQ_BFQQ_FNS						\



/* Expiration time of sync (0) and async (1) requests, in ns. */

/* Expiration time of async (0) and sync (1) requests, in ns. */

static const u64 bfq_fifo_expire[2] = { NSEC_PER_SEC / 4, NSEC_PER_SEC / 8 };



/* Maximum backwards seek (magic number lifted from CFQ), in KiB. */

block/blk-mq-debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ static const char *const cmd_flag_name[] = { 


#define RQF_NAME(name) [ilog2((__force u32)RQF_##name)] = #name

static const char *const rqf_name[] = {

	RQF_NAME(SORTED),

	RQF_NAME(STARTED),

	RQF_NAME(SOFTBARRIER),

	RQF_NAME(FLUSH_SEQ),

block/blk-mq-sched.c

+1 −5
Original line number Diff line number Diff line
@@ -385,7 +385,6 @@ bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq) 
EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge);



static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx,

				       bool has_sched,

				       struct request *rq)

{

	/*
@@ -402,9 +401,6 @@ static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx, 
	if ((rq->rq_flags & RQF_FLUSH_SEQ) || blk_rq_is_passthrough(rq))

		return true;



	if (has_sched)

		rq->rq_flags |= RQF_SORTED;



	return false;

}
@@ -418,7 +414,7 @@ void blk_mq_sched_insert_request(struct request *rq, bool at_head, 


	WARN_ON(e && (rq->tag != BLK_MQ_NO_TAG));



	if (blk_mq_sched_bypass_insert(hctx, !!e, rq)) {

	if (blk_mq_sched_bypass_insert(hctx, rq)) {

		/*

		 * Firstly normal IO request is inserted to scheduler queue or

		 * sw queue, meantime we add flush request to dispatch queue(

block/genhd.c

+2 −3
Original line number Diff line number Diff line
@@ -45,11 +45,10 @@ static void disk_release_events(struct gendisk *disk); 
void set_capacity(struct gendisk *disk, sector_t sectors)

{

	struct block_device *bdev = disk->part0;

	unsigned long flags;



	spin_lock_irqsave(&bdev->bd_size_lock, flags);

	spin_lock(&bdev->bd_size_lock);

	i_size_write(bdev->bd_inode, (loff_t)sectors << SECTOR_SHIFT);

	spin_unlock_irqrestore(&bdev->bd_size_lock, flags);

	spin_unlock(&bdev->bd_size_lock);

}

EXPORT_SYMBOL(set_capacity);