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

Commit 9cf2bab6 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: kill request ->cpu member 



This was used for completion placement for the legacy path,
but for mq we have rq->mq_ctx->cpu for that. Add a helper
to get the request CPU assignment, as the mq_ctx type is
private to blk-mq.

Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c7bb9ad1

block/blk-core.c

+0 −2
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ void blk_rq_init(struct request_queue *q, struct request *rq) 


	INIT_LIST_HEAD(&rq->queuelist);

	INIT_LIST_HEAD(&rq->timeout_list);

	rq->cpu = -1;

	rq->q = q;

	rq->__sector = (sector_t) -1;

	INIT_HLIST_NODE(&rq->hash);
@@ -1770,7 +1769,6 @@ EXPORT_SYMBOL_GPL(blk_rq_unprep_clone); 
 */

static void __blk_rq_prep_clone(struct request *dst, struct request *src)

{

	dst->cpu = src->cpu;

	dst->__sector = blk_rq_pos(src);

	dst->__data_len = blk_rq_bytes(src);

	if (src->rq_flags & RQF_SPECIAL_PAYLOAD) {

block/blk-merge.c

+0 −2
Original line number Diff line number Diff line
@@ -806,8 +806,6 @@ static struct request *attempt_merge(struct request_queue *q, 
	blk_account_io_merge(next);



	req->ioprio = ioprio_best(req->ioprio, next->ioprio);

	if (blk_rq_cpu_valid(next))

		req->cpu = next->cpu;



	/*

	 * ownership of bio passed from next to req, return 'next' for

block/blk-mq.c

+6 −1
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, 
	rq->q = data->q;

	rq->mq_ctx = data->ctx;

	rq->rq_flags = rq_flags;

	rq->cpu = -1;

	rq->cmd_flags = op;

	if (data->flags & BLK_MQ_REQ_PREEMPT)

		rq->rq_flags |= RQF_PREEMPT;
@@ -3282,6 +3281,12 @@ static bool blk_mq_poll(struct request_queue *q, blk_qc_t cookie) 
	return __blk_mq_poll(hctx, rq);

}



unsigned int blk_mq_rq_cpu(struct request *rq)

{

	return rq->mq_ctx->cpu;

}

EXPORT_SYMBOL(blk_mq_rq_cpu);



static int __init blk_mq_init(void)

{

	cpuhp_setup_state_multi(CPUHP_BLK_MQ_DEAD, "block/mq:dead", NULL,

block/blk-softirq.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int blk_softirq_cpu_dead(unsigned int cpu) 
void __blk_complete_request(struct request *req)

{

	struct request_queue *q = req->q;

	int cpu, ccpu = q->mq_ops ? req->mq_ctx->cpu : req->cpu;

	int cpu, ccpu = req->mq_ctx->cpu;

	unsigned long flags;

	bool shared = false;

drivers/scsi/bnx2i/bnx2i_hwi.c

+1 −7
Original line number Diff line number Diff line
@@ -1906,7 +1906,6 @@ static int bnx2i_queue_scsi_cmd_resp(struct iscsi_session *session, 
	struct iscsi_task *task;

	struct scsi_cmnd *sc;

	int rc = 0;

	int cpu;



	spin_lock(&session->back_lock);

	task = iscsi_itt_to_task(bnx2i_conn->cls_conn->dd_data,
@@ -1917,14 +1916,9 @@ static int bnx2i_queue_scsi_cmd_resp(struct iscsi_session *session, 
	}

	sc = task->sc;



	if (!blk_rq_cpu_valid(sc->request))

		cpu = smp_processor_id();

	else

		cpu = sc->request->cpu;



	spin_unlock(&session->back_lock);



	p = &per_cpu(bnx2i_percpu, cpu);

	p = &per_cpu(bnx2i_percpu, blk_mq_rq_cpu(sc->request));

	spin_lock(&p->p_work_lock);

	if (unlikely(!p->iothread)) {

		rc = -EINVAL;