From patchwork Sat Dec 16 12:07:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 10116923 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 32B40603B5 for ; Sat, 16 Dec 2017 12:08:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 246EE29508 for ; Sat, 16 Dec 2017 12:08:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17D4329699; Sat, 16 Dec 2017 12:08:24 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 6FEC929508 for ; Sat, 16 Dec 2017 12:08:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756895AbdLPMHt (ORCPT ); Sat, 16 Dec 2017 07:07:49 -0500 Received: from mail-qt0-f193.google.com ([209.85.216.193]:43194 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756759AbdLPMHm (ORCPT ); Sat, 16 Dec 2017 07:07:42 -0500 Received: by mail-qt0-f193.google.com with SMTP id w10so15097169qtb.10; Sat, 16 Dec 2017 04:07:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=DafT1pDKhmvRutPMHH3xTANeEK9/1gr3nBmD/QaH5u0=; b=am1jUkHT2WGH5SJ2pCaJL8TWsndHjbGYKhJlPGVkrtRpQ1I9DoPWqSv81IT7YHrNI6 8vKCTTO5Me9lBsDzfh+ywy9pKLeogalF13xPOucpAYOYqEghuGYGf1wgJJaAYsrKUwva 7IlS5oQmCyhnwgGrGmWwQodOLBGzI7AC+FNjmitPlZYgnRn1iupFeceF5UFINk2YHEp4 Z8eS1xo1eYmX67g72/1jrIR4GEoLszrAobR0Zl+/Rxy+QTCMElJPc8rj7mpDpBqM0M1z TPHAcLjm6ajxT3k5Yij3s9OvyuPSX2eguL8nreUiW3UPptFi78nGi940h7yCPJBNfr7s Bt2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=DafT1pDKhmvRutPMHH3xTANeEK9/1gr3nBmD/QaH5u0=; b=Jomhwt/TrJvVkLitiZrHDucaugE07lqhM9OAGNi5tHqaR8wXQ2WvsT68Zt+ZqeEsnD RJbXJg6gCReucwnVYOUprL01QYAs+aaDPPVT9rYp1TKUUTAcKAJ7OqfSNxj0NVGkwoan bELOaiZrDeVwZl1V3ZMgzikcDTAdWlfXgTNpsE+NN79Bk+qNXihM6jxUFIOSgNveQSdZ Th3ozT05yeEmGxRlCsd/ZI8dm10skDN8eVH760HnZRFShHrWf6ZC8tM9ZT8QNpwndH20 ExMiLRjmxb/23dJ8g2jwncTG9s1o2CJoM1eQZrXEEVyVNe1Z030XMzzM8uNkZVFLJ34s I1Ag== X-Gm-Message-State: AKGB3mJWg1F9XigdDpB9iAMTimeZ3FrXkyPAp2S4AFXuaNsNkYgtO9za hoFXKD70k3+YDmfrezTnv1k= X-Google-Smtp-Source: ACJfBot5aeWqIH2U6Ol85HCa/g2Px8WXt/g/q2R9HPfGTLGl4gNwbsdBMp3kMj6JqYWl0GrIHJudrw== X-Received: by 10.200.28.7 with SMTP id a7mr27245827qtk.206.1513426061162; Sat, 16 Dec 2017 04:07:41 -0800 (PST) Received: from localhost (dhcp-ec-8-6b-ed-7a-cf.cpe.echoes.net. [72.28.5.223]) by smtp.gmail.com with ESMTPSA id q13sm5601086qta.22.2017.12.16.04.07.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 04:07:40 -0800 (PST) From: Tejun Heo To: jack@suse.cz, axboe@kernel.dk, clm@fb.com, jbacik@fb.com Cc: kernel-team@fb.com, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, peterz@infradead.org, jianchao.w.wang@oracle.com, Bart.VanAssche@wdc.com, Tejun Heo , Asai Thambi SP , Stefan Haberland , Jan Hoeppner Subject: [PATCH 4/7] blk-mq: make blk_abort_request() trigger timeout path Date: Sat, 16 Dec 2017 04:07:23 -0800 Message-Id: <20171216120726.517153-5-tj@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171216120726.517153-1-tj@kernel.org> References: <20171216120726.517153-1-tj@kernel.org> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With issue/complete and timeout paths now using the generation number and state based synchronization, blk_abort_request() is the only one which depends on REQ_ATOM_COMPLETE for arbitrating completion. There's no reason for blk_abort_request() to be a completely separate path. This patch makes blk_abort_request() piggyback on the timeout path instead of trying to terminate the request directly. This removes the last dependency on REQ_ATOM_COMPLETE in blk-mq. Note that this makes blk_abort_request() asynchronous - it initiates abortion but the actual termination will happen after a short while, even when the caller owns the request. AFAICS, SCSI and ATA should be fine with that and I think mtip32xx and dasd should be safe but not completely sure. It'd be great if people who know the drivers take a look. Signed-off-by: Tejun Heo Cc: Asai Thambi SP Cc: Stefan Haberland Cc: Jan Hoeppner --- block/blk-mq.c | 2 +- block/blk-mq.h | 2 -- block/blk-timeout.c | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 643a38d..88baa82 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -800,7 +800,7 @@ struct blk_mq_timeout_data { unsigned int nr_expired; }; -void blk_mq_rq_timed_out(struct request *req, bool reserved) +static void blk_mq_rq_timed_out(struct request *req, bool reserved) { const struct blk_mq_ops *ops = req->q->mq_ops; enum blk_eh_timer_return ret = BLK_EH_RESET_TIMER; diff --git a/block/blk-mq.h b/block/blk-mq.h index cf01f6f..6b2d616 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -94,8 +94,6 @@ extern int blk_mq_sysfs_register(struct request_queue *q); extern void blk_mq_sysfs_unregister(struct request_queue *q); extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx); -extern void blk_mq_rq_timed_out(struct request *req, bool reserved); - void blk_mq_release(struct request_queue *q); /** diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 6427be7..d580af3 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -156,12 +156,12 @@ void blk_timeout_work(struct work_struct *work) */ void blk_abort_request(struct request *req) { - if (blk_mark_rq_complete(req)) - return; - if (req->q->mq_ops) { - blk_mq_rq_timed_out(req, false); + req->deadline = jiffies; + mod_timer(&req->q->timeout, 0); } else { + if (blk_mark_rq_complete(req)) + return; blk_delete_timer(req); blk_rq_timed_out(req); }