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

Commit 3e917ddd authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge ba77929c on remote branch 

Change-Id: I707b543f2d37c4320afb9096fa72c1103915883a
parents c58687b8 ba77929c

arch/arm64/configs/vendor/kona-perf_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -466,8 +466,6 @@ CONFIG_HID_MICROSOFT=y 
CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_PLAYSTATION=y

CONFIG_PLAYSTATION_FF=y

CONFIG_HID_SONY=y

CONFIG_SONY_FF=y

CONFIG_HID_QVR=y

arch/arm64/configs/vendor/kona_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -484,8 +484,6 @@ CONFIG_HID_MICROSOFT=y 
CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_PLAYSTATION=y

CONFIG_PLAYSTATION_FF=y

CONFIG_HID_SONY=y

CONFIG_SONY_FF=y

CONFIG_HID_QVR=y

block/blk-flush.c

+5 −0
Original line number Diff line number Diff line
@@ -289,6 +289,11 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error) 
		spin_unlock_irqrestore(&fq->mq_flush_lock, flags);

}



bool is_flush_rq(struct request *rq)

{

	return rq->end_io == flush_end_io;

}



/**

 * blk_kick_flush - consider issuing flush request

 * @q: request_queue being kicked

block/blk-mq-tag.c

+30 −7
Original line number Diff line number Diff line
@@ -218,6 +218,20 @@ struct bt_iter_data { 
	bool reserved;

};



static struct request *blk_mq_find_and_get_req(struct blk_mq_tags *tags,

		unsigned int bitnr)

{

	struct request *rq;

	unsigned long flags;



	spin_lock_irqsave(&tags->lock, flags);

	rq = tags->rqs[bitnr];

	if (!rq || !refcount_inc_not_zero(&rq->ref))

		rq = NULL;

	spin_unlock_irqrestore(&tags->lock, flags);

	return rq;

}



static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data)

{

	struct bt_iter_data *iter_data = data;
@@ -225,18 +239,23 @@ static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) 
	struct blk_mq_tags *tags = hctx->tags;

	bool reserved = iter_data->reserved;

	struct request *rq;

	bool ret = true;



	if (!reserved)

		bitnr += tags->nr_reserved_tags;

	rq = tags->rqs[bitnr];



	/*

	 * We can hit rq == NULL here, because the tagging functions

	 * test and set the bit before assining ->rqs[].

	 */

	if (rq && rq->q == hctx->queue)

		iter_data->fn(hctx, rq, iter_data->data, reserved);

	rq = blk_mq_find_and_get_req(tags, bitnr);

	if (!rq)

		return true;



	if (rq->q == hctx->queue)

		iter_data->fn(hctx, rq, iter_data->data, reserved);

	blk_mq_put_rq_ref(rq);

	return ret;

}



static void bt_for_each(struct blk_mq_hw_ctx *hctx, struct sbitmap_queue *bt,
@@ -265,6 +284,7 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) 
	struct blk_mq_tags *tags = iter_data->tags;

	bool reserved = iter_data->reserved;

	struct request *rq;

	bool ret = true;



	if (!reserved)

		bitnr += tags->nr_reserved_tags;
@@ -273,11 +293,13 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) 
	 * We can hit rq == NULL here, because the tagging functions

	 * test and set the bit before assining ->rqs[].

	 */

	rq = tags->rqs[bitnr];

	if (rq && blk_mq_request_started(rq))

		iter_data->fn(rq, iter_data->data, reserved);



	rq = blk_mq_find_and_get_req(tags, bitnr);

	if (!rq)

		return true;

	if (blk_mq_request_started(rq))

		iter_data->fn(rq, iter_data->data, reserved);

	blk_mq_put_rq_ref(rq);

	return ret;

}



static void bt_tags_for_each(struct blk_mq_tags *tags, struct sbitmap_queue *bt,
@@ -389,6 +411,7 @@ struct blk_mq_tags *blk_mq_init_tags(unsigned int total_tags, 


	tags->nr_tags = total_tags;

	tags->nr_reserved_tags = reserved_tags;

	spin_lock_init(&tags->lock);



	return blk_mq_init_bitmap_tags(tags, node, alloc_policy);

}

block/blk-mq-tag.h

+6 −1
Original line number Diff line number Diff line
@@ -19,8 +19,13 @@ struct blk_mq_tags { 
	struct request **rqs;

	struct request **static_rqs;

	struct list_head page_list;

};



	/*

	 * used to clear request reference in rqs[] before freeing one

	 * request pool

	 */

	spinlock_t lock;

};



extern struct blk_mq_tags *blk_mq_init_tags(unsigned int nr_tags, unsigned int reserved_tags, int node, int alloc_policy);

extern void blk_mq_free_tags(struct blk_mq_tags *tags);