From patchwork Wed May 9 07:54:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10388573 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 124FE60170 for ; Wed, 9 May 2018 07:54:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 053E828E68 for ; Wed, 9 May 2018 07:54:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDF8F28E6C; Wed, 9 May 2018 07:54:43 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4217628E68 for ; Wed, 9 May 2018 07:54:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7BB36B038E; Wed, 9 May 2018 03:54:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D2A836B0391; Wed, 9 May 2018 03:54:41 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1AF96B0392; Wed, 9 May 2018 03:54:41 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 7E4A86B038E for ; Wed, 9 May 2018 03:54:41 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id e3so8564749pfe.15 for ; Wed, 09 May 2018 00:54:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=5rBEEMX3segk9hT1zQ24VMHJSNR2/kysxa/mWKN5kek=; b=bBnVgB2uQMyxw2PfnXGh1npRI/++SudB9SZxNsqU+LjdxLxQF4XF7E0jwfc+gG7VvO nzOabStlMgxGR3qdOXrQF6QHPXthKXwGt7v2kBdObMD+ug5BSb6Bh2FwERT82vwjLsKt bHyI8NEiloyuW98YuhulD1dHrFo9Xh/CT4Vb0X10B+aELBBrnizjXE506kUx9D2L7kGq GOhxt2CzT3Lslpvf6pIGRzymUYjLXVM3r/K16ubkMoceR82e9Ezk3t5BjrjaVpubEdNr 2401VIgWXY+BlyQkWNMUlo6Om/XRMvza9308x/QXLwPtpuRy9acNryjXFcUNxhmuS2PF VsdA== X-Gm-Message-State: ALQs6tAJD1Eey7KZZuz9rhs694cJncS2NcFimGKDDfNVdA0SNjR+sMqM wuLdj0kwcKl1Pxygz7uX4n8xxlxStyRbBV01p6yd62QAZJF6TNZKHsaF/z9BS9lrilO4N3JCve0 iTtDTb1nZEvbSBvgxb50u3TYBB9D+MvAHpGbUp7/trFqe+upAT7/Ubd6uFOaBGsE= X-Received: by 2002:a63:6f81:: with SMTP id k123-v6mr35623187pgc.115.1525852481198; Wed, 09 May 2018 00:54:41 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqSTJ7Y3Z0zdCOufvOWS223xAXaZqF7YYE8H8n+fcK/cdWZKWPMJ4YXD+CUMHF0s4K4uEsI X-Received: by 2002:a63:6f81:: with SMTP id k123-v6mr35623151pgc.115.1525852480330; Wed, 09 May 2018 00:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525852480; cv=none; d=google.com; s=arc-20160816; b=UnrH/1nAGUia+TNcrsSFobm4G4AdnZQC/UXV2qQo3FuLUdYc7ry1FGZEj8m+113ktU JzOXR+DAQR74BAn8R+vb6LsXcDqgMp3Ipp/X/n9LR4DM773UO79XUXwP1Hpvyt3U3odZ 9UEbjFpRvIikeF0BMDzUZJyGDJXSMCxM6XQeclUZfuE7H+mUoDoolPndavlcQbSV1Q+b TjPbqAjN59xAOGziSLbm8p5t+jeE/U49QWwTZJE5JPH6Sj5ziwvEAYssSaEHWbqG5Eh7 wRf8tEn4W6ZLnzqeLrzbK/VhYFMGFGW9wUsams7IkABizH7prPjSKyRWpkdd213mD/E5 DsPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=5rBEEMX3segk9hT1zQ24VMHJSNR2/kysxa/mWKN5kek=; b=lDsIQws2YkwvfIWjKpz/RP7+00fB7X0gmdqx22MYkx36AvnTMB4yRP28zr1+yKGhT/ ZlLAdFhPf1yfdIVW9v5JSDNQ6T2Ovjs4K3JkkRq3fbOGPdKobdDvSdgY4Q9tIs3VYW3O rBJwHZ7rF78ylaWyEOFQ0M06dAiR6e/r7ljTDfepqbj/p3Mlkln4utsje6NOByzPKwWS zqJ10F1FgsrLAXV1/F9d8KQFohIstNDNz5njpGzVOSPJXzUFrE8bhJY0MTWQvD6xN9y+ UdPiKDszPiTVgiz1yh53uWfiCbgCS6oWom+2+chOz5WdevV/HzjLLfHi04dAv+KE11sZ DvKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=fdxlSmng; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 198.137.202.133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [198.137.202.133]) by mx.google.com with ESMTPS id y40-v6si25918734pla.470.2018.05.09.00.54.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 00:54:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 198.137.202.133 as permitted sender) client-ip=198.137.202.133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=fdxlSmng; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 198.137.202.133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=5rBEEMX3segk9hT1zQ24VMHJSNR2/kysxa/mWKN5kek=; b=fdxlSmngIxFgBwGceYGbNpw4c jGT6whGc1RLi5Le4D8YEyPVyPbxCsbqMmhlmnkbnqPmslq/XaN9yNqWGTlTY/ZTnuUCApgy1TNm2V hMKUfvPHCYNO1TOWOyF+X6eTDvYnyoWUG6N377zFj7bJssnRJtHCNPwKhgB8/TYThYe5okhrN4YcC UiGbllXv5k+Hyq08QTtBu/9h/y7PRv2vG3JiFFJN7BzdZGuhtFLj3meQ1u6ksxPlPRmmfNMg0fy7K 1ilwzTBJLpITyFLWyLOZ0XyBXasTwxaZlH3b8s6JsUlJlRuc66pCpMvU+/qtDEgarC1zjdwuCAm2l L13hMIrHg==; Received: from 213-225-15-246.nat.highway.a1.net ([213.225.15.246] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGJvl-0004JK-40; Wed, 09 May 2018 07:54:33 +0000 From: Christoph Hellwig To: axboe@kernel.dk Cc: Bart.VanAssche@wdc.com, willy@infradead.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 4/6] block: pass an explicit gfp_t to get_request Date: Wed, 9 May 2018 09:54:06 +0200 Message-Id: <20180509075408.16388-5-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509075408.16388-1-hch@lst.de> References: <20180509075408.16388-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP blk_old_get_request already has it at hand, and in blk_queue_bio, which is the fast path, it is constant. Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke Reviewed-by: Bart Van Assche --- block/blk-core.c | 14 +++++++------- drivers/scsi/scsi_error.c | 4 ---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 5013027eae70..cc56e56c2eff 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1333,6 +1333,7 @@ int blk_update_nr_requests(struct request_queue *q, unsigned int nr) * @op: operation and flags * @bio: bio to allocate request for (can be %NULL) * @flags: BLQ_MQ_REQ_* flags + * @gfp_mask: allocator flags * * Get a free request from @q. This function may fail under memory * pressure or if @q is dead. @@ -1342,7 +1343,7 @@ int blk_update_nr_requests(struct request_queue *q, unsigned int nr) * Returns request pointer on success, with @q->queue_lock *not held*. */ static struct request *__get_request(struct request_list *rl, unsigned int op, - struct bio *bio, blk_mq_req_flags_t flags) + struct bio *bio, blk_mq_req_flags_t flags, gfp_t gfp_mask) { struct request_queue *q = rl->q; struct request *rq; @@ -1351,8 +1352,6 @@ static struct request *__get_request(struct request_list *rl, unsigned int op, struct io_cq *icq = NULL; const bool is_sync = op_is_sync(op); int may_queue; - gfp_t gfp_mask = flags & BLK_MQ_REQ_NOWAIT ? GFP_ATOMIC : - __GFP_DIRECT_RECLAIM; req_flags_t rq_flags = RQF_ALLOCED; lockdep_assert_held(q->queue_lock); @@ -1516,6 +1515,7 @@ static struct request *__get_request(struct request_list *rl, unsigned int op, * @op: operation and flags * @bio: bio to allocate request for (can be %NULL) * @flags: BLK_MQ_REQ_* flags. + * @gfp: allocator flags * * Get a free request from @q. If %BLK_MQ_REQ_NOWAIT is set in @flags, * this function keeps retrying under memory pressure and fails iff @q is dead. @@ -1525,7 +1525,7 @@ static struct request *__get_request(struct request_list *rl, unsigned int op, * Returns request pointer on success, with @q->queue_lock *not held*. */ static struct request *get_request(struct request_queue *q, unsigned int op, - struct bio *bio, blk_mq_req_flags_t flags) + struct bio *bio, blk_mq_req_flags_t flags, gfp_t gfp) { const bool is_sync = op_is_sync(op); DEFINE_WAIT(wait); @@ -1537,7 +1537,7 @@ static struct request *get_request(struct request_queue *q, unsigned int op, rl = blk_get_rl(q, bio); /* transferred to @rq on success */ retry: - rq = __get_request(rl, op, bio, flags); + rq = __get_request(rl, op, bio, flags, gfp); if (!IS_ERR(rq)) return rq; @@ -1591,7 +1591,7 @@ static struct request *blk_old_get_request(struct request_queue *q, if (ret) return ERR_PTR(ret); spin_lock_irq(q->queue_lock); - rq = get_request(q, op, NULL, flags); + rq = get_request(q, op, NULL, flags, gfp_mask); if (IS_ERR(rq)) { spin_unlock_irq(q->queue_lock); blk_queue_exit(q); @@ -2057,7 +2057,7 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) * Returns with the queue unlocked. */ blk_queue_enter_live(q); - req = get_request(q, bio->bi_opf, bio, 0); + req = get_request(q, bio->bi_opf, bio, 0, __GFP_DIRECT_RECLAIM); if (IS_ERR(req)) { blk_queue_exit(q); __wbt_done(q->rq_wb, wb_acct); diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 61d280f560df..b36e73090018 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -1933,10 +1933,6 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) struct request *req; struct scsi_request *rq; - /* - * blk_get_request with GFP_KERNEL (__GFP_RECLAIM) sleeps until a - * request becomes available - */ req = blk_get_request(sdev->request_queue, REQ_OP_SCSI_IN, 0); if (IS_ERR(req)) return;