Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4443f8e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20190412' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Set of fixes that should go into this round. This pull is larger than
  I'd like at this time, but there's really no specific reason for that.
  Some are fixes for issues that went into this merge window, others are
  not. Anyway, this contains:

   - Hardware queue limiting for virtio-blk/scsi (Dongli)

   - Multi-page bvec fixes for lightnvm pblk

   - Multi-bio dio error fix (Jason)

   - Remove the cache hint from the io_uring tool side, since we didn't
     move forward with that (me)

   - Make io_uring SETUP_SQPOLL root restricted (me)

   - Fix leak of page in error handling for pc requests (Jérôme)

   - Fix BFQ regression introduced in this merge window (Paolo)

   - Fix break logic for bio segment iteration (Ming)

   - Fix NVMe cancel request error handling (Ming)

   - NVMe pull request with two fixes (Christoph):
       - fix the initial CSN for nvme-fc (James)
       - handle log page offsets properly in the target (Keith)"

* tag 'for-linus-20190412' of git://git.kernel.dk/linux-block:
  block: fix the return errno for direct IO
  nvmet: fix discover log page when offsets are used
  nvme-fc: correct csn initialization and increments on error
  block: do not leak memory in bio_copy_user_iov()
  lightnvm: pblk: fix crash in pblk_end_partial_read due to multipage bvecs
  nvme: cancel request synchronously
  blk-mq: introduce blk_mq_complete_request_sync()
  scsi: virtio_scsi: limit number of hw queues by nr_cpu_ids
  virtio-blk: limit number of hw queues by nr_cpu_ids
  block, bfq: fix use after free in bfq_bfqq_expire
  io_uring: restrict IORING_SETUP_SQPOLL to root
  tools/io_uring: remove IOCQE_FLAG_CACHEHIT
  block: don't use for-inside-for in bio_for_each_segment_all
parents b60bc066 a89afe58

block/bfq-iosched.c

+7 −8
Original line number Diff line number Diff line
@@ -2822,7 +2822,7 @@ static void bfq_dispatch_remove(struct request_queue *q, struct request *rq) 
	bfq_remove_request(q, rq);

}



static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)

static bool __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)

{

	/*

	 * If this bfqq is shared between multiple processes, check
@@ -2855,9 +2855,11 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq) 
	/*

	 * All in-service entities must have been properly deactivated

	 * or requeued before executing the next function, which

	 * resets all in-service entites as no more in service.

	 * resets all in-service entities as no more in service. This

	 * may cause bfqq to be freed. If this happens, the next

	 * function returns true.

	 */

	__bfq_bfqd_reset_in_service(bfqd);

	return __bfq_bfqd_reset_in_service(bfqd);

}



/**
@@ -3262,7 +3264,6 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, 
	bool slow;

	unsigned long delta = 0;

	struct bfq_entity *entity = &bfqq->entity;

	int ref;



	/*

	 * Check whether the process is slow (see bfq_bfqq_is_slow).
@@ -3347,10 +3348,8 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, 
	 * reason.

	 */

	__bfq_bfqq_recalc_budget(bfqd, bfqq, reason);

	ref = bfqq->ref;

	__bfq_bfqq_expire(bfqd, bfqq);



	if (ref == 1) /* bfqq is gone, no more actions on it */

	if (__bfq_bfqq_expire(bfqd, bfqq))

		/* bfqq is gone, no more actions on it */

		return;



	bfqq->injected_service = 0;

block/bfq-iosched.h

+1 −1
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ bool __bfq_deactivate_entity(struct bfq_entity *entity, 
			     bool ins_into_idle_tree);

bool next_queue_may_preempt(struct bfq_data *bfqd);

struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd);

void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd);

bool __bfq_bfqd_reset_in_service(struct bfq_data *bfqd);

void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,

			 bool ins_into_idle_tree, bool expiration);

void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);

block/bfq-wf2q.c

+15 −2
Original line number Diff line number Diff line
@@ -1605,7 +1605,8 @@ struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd) 
	return bfqq;

}



void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)

/* returns true if the in-service queue gets freed */

bool __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)

{

	struct bfq_queue *in_serv_bfqq = bfqd->in_service_queue;

	struct bfq_entity *in_serv_entity = &in_serv_bfqq->entity;
@@ -1629,8 +1630,20 @@ void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd) 
	 * service tree either, then release the service reference to

	 * the queue it represents (taken with bfq_get_entity).

	 */

	if (!in_serv_entity->on_st)

	if (!in_serv_entity->on_st) {

		/*

		 * If no process is referencing in_serv_bfqq any

		 * longer, then the service reference may be the only

		 * reference to the queue. If this is the case, then

		 * bfqq gets freed here.

		 */

		int ref = in_serv_bfqq->ref;

		bfq_put_queue(in_serv_bfqq);

		if (ref == 1)

			return true;

	}



	return false;

}



void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,

block/bio.c

+4 −1
Original line number Diff line number Diff line
@@ -1298,8 +1298,11 @@ struct bio *bio_copy_user_iov(struct request_queue *q, 
			}

		}



		if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes)

		if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes) {

			if (!map_data)

				__free_page(page);

			break;

		}



		len -= bytes;

		offset = 0;

block/blk-mq.c

+7 −0
Original line number Diff line number Diff line
@@ -654,6 +654,13 @@ bool blk_mq_complete_request(struct request *rq) 
}

EXPORT_SYMBOL(blk_mq_complete_request);



void blk_mq_complete_request_sync(struct request *rq)

{

	WRITE_ONCE(rq->state, MQ_RQ_COMPLETE);

	rq->q->mq_ops->complete(rq);

}

EXPORT_SYMBOL_GPL(blk_mq_complete_request_sync);



int blk_mq_request_started(struct request *rq)

{

	return blk_mq_rq_state(rq) != MQ_RQ_IDLE;