From patchwork Mon Feb 27 17:47:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9593651 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 80C4260471 for ; Mon, 27 Feb 2017 17:49:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DDDB283FD for ; Mon, 27 Feb 2017 17:49:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 627F728491; Mon, 27 Feb 2017 17:49:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E92AD283FD for ; Mon, 27 Feb 2017 17:49:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751387AbdB0Rtv (ORCPT ); Mon, 27 Feb 2017 12:49:51 -0500 Received: from mail-pg0-f50.google.com ([74.125.83.50]:35129 "EHLO mail-pg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751334AbdB0Rtu (ORCPT ); Mon, 27 Feb 2017 12:49:50 -0500 Received: by mail-pg0-f50.google.com with SMTP id b129so47033779pgc.2 for ; Mon, 27 Feb 2017 09:48:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=AN/RU3rmVw08OPk0NYSidV3EbYYUQDirjvTbmXNIaiE=; b=haEgUDW6uxrV6Kv3cughjGt+uJPcIBRt4yhq3jOr2RgKhzeSnE8Aw+HuHHV34LvqiF KDkfRY31HEzlsbATrsIBRdDP1ScZFS5xH+ThAznk3tfCiJHsmPM+TrY1eFiMny6QtPH6 Qa/fI5uuyooA36nw6hIRG/ITKlfbMKBBFnYfsTUTbFrQR7N/NDJiqH6fOnofIGh7lA2Y Qs0NA7HNjHMKQuS4K4j97yaGYgbcYSftZRYR8OPlXmVkaCRee/FMtwOGqZuiVBrKu/J0 9N58TDF605lVXbB7eXmQeDJoSfgYXODP+yNkuTpk4eOB1NSDX3oqKB6z2CfYMzI6zG8u a6bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AN/RU3rmVw08OPk0NYSidV3EbYYUQDirjvTbmXNIaiE=; b=j0zBZe8aFIrMnxAeZlo/2WaVoidd9zfV0tAqG/Tb3YfUwvisJIJsDzBKwS6wHEONr0 XQEYK2q6n5X4+4G4WdA6jE+BBQel8a3R0sozGMJmlA+oum0MggZ1Ie1nMa4kzmVst+Ks dg20LNOufsUUOG5KXusfiJeu7jueNb+8ITIPMffL28ioFMHn5zoL0p7mKz7J2uA6uWDQ bJzJGGkW8Du/G3K4Ms5KY/FfeJJ+IlU6cSvPFNe6pgjFNOaMoFng8R0vDaHJWDC+lOTe zEPBmramIRxdsXE181rFf0MysvH5rxfPeEASALDqKhdTEllnujzz4Q3ERgMkQzSadGnD BDcg== X-Gm-Message-State: AMke39m/WZoNhh/pVLveD1fecRxBHQacyCA9ZdVOGqV7fo9kpVj/VInZcoqeoFrMZ7AmuiVP X-Received: by 10.98.9.14 with SMTP id e14mr22052369pfd.117.1488217722474; Mon, 27 Feb 2017 09:48:42 -0800 (PST) Received: from vader.thefacebook.com ([2620:10d:c090:180::93d5]) by smtp.gmail.com with ESMTPSA id o24sm31893041pfj.78.2017.02.27.09.48.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Feb 2017 09:48:41 -0800 (PST) From: Omar Sandoval To: Jens Axboe , Sagi Grimberg , linux-block@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 1/3] blk-mq: make blk_mq_alloc_request_hctx() allocate a scheduler request Date: Mon, 27 Feb 2017 09:47:53 -0800 Message-Id: X-Mailer: git-send-email 2.12.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval blk_mq_alloc_request_hctx() allocates a driver request directly, unlike its blk_mq_alloc_request() counterpart. It also crashes because it doesn't update the tags->rqs map. Fix it by making it allocate a scheduler request. Reported-by: Sagi Grimberg Signed-off-by: Omar Sandoval Tested-by: Sagi Grimberg --- I think this should do it. Verified that normal operation still works for me, but I'm not sure how to test the actual _hctx() alloc path. Sagi, could you please test this series out? block/blk-mq-sched.c | 11 +++++------ block/blk-mq.c | 34 +++++++++++++++------------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 46ca965fff5c..5697b23412a1 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -110,15 +110,14 @@ struct request *blk_mq_sched_get_request(struct request_queue *q, struct blk_mq_alloc_data *data) { struct elevator_queue *e = q->elevator; - struct blk_mq_hw_ctx *hctx; - struct blk_mq_ctx *ctx; struct request *rq; blk_queue_enter_live(q); - ctx = blk_mq_get_ctx(q); - hctx = blk_mq_map_queue(q, ctx->cpu); - - blk_mq_set_alloc_data(data, q, data->flags, ctx, hctx); + data->q = q; + if (likely(!data->ctx)) + data->ctx = blk_mq_get_ctx(q); + if (likely(!data->hctx)) + data->hctx = blk_mq_map_queue(q, data->ctx->cpu); if (e) { data->flags |= BLK_MQ_REQ_INTERNAL; diff --git a/block/blk-mq.c b/block/blk-mq.c index 9611cd9920e9..cc9713f574a5 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -273,10 +273,9 @@ EXPORT_SYMBOL(blk_mq_alloc_request); struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw, unsigned int flags, unsigned int hctx_idx) { - struct blk_mq_hw_ctx *hctx; - struct blk_mq_ctx *ctx; + struct blk_mq_alloc_data alloc_data = { .flags = flags }; struct request *rq; - struct blk_mq_alloc_data alloc_data; + unsigned int cpu; int ret; /* @@ -299,26 +298,23 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw, * Check if the hardware context is actually mapped to anything. * If not tell the caller that it should skip this queue. */ - hctx = q->queue_hw_ctx[hctx_idx]; - if (!blk_mq_hw_queue_mapped(hctx)) { - ret = -EXDEV; - goto out_queue_exit; + alloc_data.hctx = q->queue_hw_ctx[hctx_idx]; + if (!blk_mq_hw_queue_mapped(alloc_data.hctx)) { + blk_queue_exit(q); + return ERR_PTR(-EXDEV); } - ctx = __blk_mq_get_ctx(q, cpumask_first(hctx->cpumask)); + cpu = cpumask_first(alloc_data.hctx->cpumask); + alloc_data.ctx = __blk_mq_get_ctx(q, cpu); - blk_mq_set_alloc_data(&alloc_data, q, flags, ctx, hctx); - rq = __blk_mq_alloc_request(&alloc_data, rw); - if (!rq) { - ret = -EWOULDBLOCK; - goto out_queue_exit; - } - alloc_data.hctx->tags->rqs[rq->tag] = rq; - - return rq; + rq = blk_mq_sched_get_request(q, NULL, rw, &alloc_data); -out_queue_exit: + blk_mq_put_ctx(alloc_data.ctx); blk_queue_exit(q); - return ERR_PTR(ret); + + if (!rq) + return ERR_PTR(-EWOULDBLOCK); + + return rq; } EXPORT_SYMBOL_GPL(blk_mq_alloc_request_hctx);