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

Merge tag 'for-linus-2019-10-18' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - NVMe pull request from Keith that address deadlocks, double resets,
   memory leaks, and other regression.

 - Fixup elv_support_iosched() for bio based devices (Damien)

 - Fixup for the ahci PCS quirk (Dan)

 - Socket O_NONBLOCK handling fix for io_uring (me)

 - Timeout sequence io_uring fixes (yangerkun)

 - MD warning fix for parameter default_layout (Song)

 - blkcg activation fixes (Tejun)

 - blk-rq-qos node deletion fix (Tejun)

* tag 'for-linus-2019-10-18' of git://git.kernel.dk/linux-block:
  nvme-pci: Set the prp2 correctly when using more than 4k page
  io_uring: fix logic error in io_timeout
  io_uring: fix up O_NONBLOCK handling for sockets
  md/raid0: fix warning message for parameter default_layout
  libata/ahci: Fix PCS quirk application
  blk-rq-qos: fix first node deletion of rq_qos_del()
  blkcg: Fix multiple bugs in blkcg_activate_policy()
  io_uring: consider the overflow of sequence for timeout req
  nvme-tcp: fix possible leakage during error flow
  nvmet-loop: fix possible leakage during error flow
  block: Fix elv_support_iosched()
  nvme-tcp: Initialize sk->sk_ll_usec only with NET_RX_BUSY_POLL
  nvme: Wait for reset state when required
  nvme: Prevent resets during paused controller state
  nvme: Restart request timers in resetting state
  nvme: Remove ADMIN_ONLY state
  nvme-pci: Free tagset if no IO queues
  nvme: retain split access workaround for capability reads
  nvme: fix possible deadlock when nvme_update_formats fails
parents dfdcff32 b55f0097

block/blk-cgroup.c

+51 −18
Original line number Diff line number Diff line
@@ -1362,7 +1362,7 @@ int blkcg_activate_policy(struct request_queue *q, 
			  const struct blkcg_policy *pol)

{

	struct blkg_policy_data *pd_prealloc = NULL;

	struct blkcg_gq *blkg;

	struct blkcg_gq *blkg, *pinned_blkg = NULL;

	int ret;



	if (blkcg_policy_enabled(q, pol))
@@ -1370,49 +1370,82 @@ int blkcg_activate_policy(struct request_queue *q, 


	if (queue_is_mq(q))

		blk_mq_freeze_queue(q);

pd_prealloc:

	if (!pd_prealloc) {

		pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q, &blkcg_root);

		if (!pd_prealloc) {

			ret = -ENOMEM;

			goto out_bypass_end;

		}

	}



retry:

	spin_lock_irq(&q->queue_lock);



	/* blkg_list is pushed at the head, reverse walk to init parents first */

	/* blkg_list is pushed at the head, reverse walk to allocate parents first */

	list_for_each_entry_reverse(blkg, &q->blkg_list, q_node) {

		struct blkg_policy_data *pd;



		if (blkg->pd[pol->plid])

			continue;



		pd = pol->pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q, &blkcg_root);

		if (!pd)

			swap(pd, pd_prealloc);

		/* If prealloc matches, use it; otherwise try GFP_NOWAIT */

		if (blkg == pinned_blkg) {

			pd = pd_prealloc;

			pd_prealloc = NULL;

		} else {

			pd = pol->pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q,

					      blkg->blkcg);

		}



		if (!pd) {

			/*

			 * GFP_NOWAIT failed.  Free the existing one and

			 * prealloc for @blkg w/ GFP_KERNEL.

			 */

			if (pinned_blkg)

				blkg_put(pinned_blkg);

			blkg_get(blkg);

			pinned_blkg = blkg;



			spin_unlock_irq(&q->queue_lock);

			goto pd_prealloc;



			if (pd_prealloc)

				pol->pd_free_fn(pd_prealloc);

			pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q,

						       blkg->blkcg);

			if (pd_prealloc)

				goto retry;

			else

				goto enomem;

		}



		blkg->pd[pol->plid] = pd;

		pd->blkg = blkg;

		pd->plid = pol->plid;

		if (pol->pd_init_fn)

			pol->pd_init_fn(pd);

	}



	/* all allocated, init in the same order */

	if (pol->pd_init_fn)

		list_for_each_entry_reverse(blkg, &q->blkg_list, q_node)

			pol->pd_init_fn(blkg->pd[pol->plid]);



	__set_bit(pol->plid, q->blkcg_pols);

	ret = 0;



	spin_unlock_irq(&q->queue_lock);

out_bypass_end:

out:

	if (queue_is_mq(q))

		blk_mq_unfreeze_queue(q);

	if (pinned_blkg)

		blkg_put(pinned_blkg);

	if (pd_prealloc)

		pol->pd_free_fn(pd_prealloc);

	return ret;



enomem:

	/* alloc failed, nothing's initialized yet, free everything */

	spin_lock_irq(&q->queue_lock);

	list_for_each_entry(blkg, &q->blkg_list, q_node) {

		if (blkg->pd[pol->plid]) {

			pol->pd_free_fn(blkg->pd[pol->plid]);

			blkg->pd[pol->plid] = NULL;

		}

	}

	spin_unlock_irq(&q->queue_lock);

	ret = -ENOMEM;

	goto out;

}

EXPORT_SYMBOL_GPL(blkcg_activate_policy);

block/blk-rq-qos.h

+5 −8
Original line number Diff line number Diff line
@@ -108,16 +108,13 @@ static inline void rq_qos_add(struct request_queue *q, struct rq_qos *rqos) 


static inline void rq_qos_del(struct request_queue *q, struct rq_qos *rqos)

{

	struct rq_qos *cur, *prev = NULL;

	for (cur = q->rq_qos; cur; cur = cur->next) {

		if (cur == rqos) {

			if (prev)

				prev->next = rqos->next;

			else

				q->rq_qos = cur;

	struct rq_qos **cur;



	for (cur = &q->rq_qos; *cur; cur = &(*cur)->next) {

		if (*cur == rqos) {

			*cur = rqos->next;

			break;

		}

		prev = cur;

	}



	blk_mq_debugfs_unregister_rqos(rqos);

block/elevator.c

+2 −1
Original line number Diff line number Diff line
@@ -616,7 +616,8 @@ out: 


static inline bool elv_support_iosched(struct request_queue *q)

{

	if (q->tag_set && (q->tag_set->flags & BLK_MQ_F_NO_SCHED))

	if (!q->mq_ops ||

	    (q->tag_set && (q->tag_set->flags & BLK_MQ_F_NO_SCHED)))

		return false;

	return true;

}

drivers/ata/ahci.c

+3 −1
Original line number Diff line number Diff line
@@ -1600,7 +1600,9 @@ static void ahci_intel_pcs_quirk(struct pci_dev *pdev, struct ahci_host_priv *hp 
	 */

	if (!id || id->vendor != PCI_VENDOR_ID_INTEL)

		return;

	if (((enum board_ids) id->driver_data) < board_ahci_pcs7)



	/* Skip applying the quirk on Denverton and beyond */

	if (((enum board_ids) id->driver_data) >= board_ahci_pcs7)

		return;



	/*

drivers/md/raid0.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf) 
	} else {

		pr_err("md/raid0:%s: cannot assemble multi-zone RAID0 with default_layout setting\n",

		       mdname(mddev));

		pr_err("md/raid0: please set raid.default_layout to 1 or 2\n");

		pr_err("md/raid0: please set raid0.default_layout to 1 or 2\n");

		err = -ENOTSUPP;

		goto abort;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE