From patchwork Wed Mar 21 07:23:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10298723 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 565D760349 for ; Wed, 21 Mar 2018 07:23:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CD9B28D85 for ; Wed, 21 Mar 2018 07:23:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EB7328D88; Wed, 21 Mar 2018 07:23:51 +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=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 7DDE828D85 for ; Wed, 21 Mar 2018 07:23:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751396AbeCUHXt (ORCPT ); Wed, 21 Mar 2018 03:23:49 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:43748 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751319AbeCUHXt (ORCPT ); Wed, 21 Mar 2018 03:23:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: 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=xyp0zDc/kAqXJQdq/S0HGQmR27ztT3GHGFSIScdzJHk=; b=mluqzaoFrDb4fM7mCFDYIF8eM ycaDjcIVj3F6mD/nI7zvST2u58RF20zRDf0SPQDP2b6aOpE9CmqFHj+jQpktn7Mqe0om5sPraSFIo Jn/38y1SLl5P2bbyAufBc8NWbLPLVW6VXTcKdcSijmI59/sGKkSHJB+f0TnRAh25BkoLI389chUfK o6Q8RbpVWJf8zRaPqNx02TqBfcL0MOGpF8TwQH4eI2SbHNHgfYJi2wO5uKbLcs0d8WyprjpRUrHok rOmSOsC5avMt02YWscs9HB6gdFxn/L1yPPlkxMhcx7c2P707fsdeXNShx5xJcGMe8SlsVY50FA2nY UNYI7ggOw==; Received: from hch by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyY60-00016t-Iu; Wed, 21 Mar 2018 07:23:40 +0000 Date: Wed, 21 Mar 2018 00:23:40 -0700 From: Christoph Hellwig To: Andrei Vagin Cc: Christoph Hellwig , Andrei Vagin , "Nicholas A. Bellinger" , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, shli@fb.com, axboe@kernel.dk Subject: Re: [PATCH] [RFC] target/file: add support of direct and async I/O Message-ID: <20180321072340.GA29587@infradead.org> References: <20180309004259.16052-1-avagin@openvz.org> <20180316075027.GA19192@infradead.org> <20180320075456.GA11151@outlook.office365.com> <20180320084701.GA4241@infradead.org> <20180320204100.GA31300@outlook.office365.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180320204100.GA31300@outlook.office365.com> User-Agent: Mutt/1.9.2 (2017-12-15) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP > I'm afraid this patch doesn't work, because we are not always allocate bvec, > sometimes we get it from bio. In this case, we have to call > blk_mq_complete_request after read_iter/write_iter. The issue there is that we really need to NULL ->bvec after freeing it. Which normally is an anti-pattern but seems to be needed here (and warrants a comment). Updated patch below: From b8eed7302071023852c00f8296165c2e9bbc51f4 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 20 Mar 2018 09:35:55 +0100 Subject: loop: remove loop_cmd refcounting Instead of introducing an unneeded refcount free the bvec after calling into ->read_iter and ->write_iter, which follows the the normal read/write path conventions. Fixes: 92d77332 ("block/loop: fix use after free") Signed-off-by: Christoph Hellwig --- drivers/block/loop.c | 19 +++++++------------ drivers/block/loop.h | 1 - 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index ee62d2d517bf..9cb6078cd4f0 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -463,15 +463,6 @@ static void lo_complete_rq(struct request *rq) blk_mq_end_request(rq, cmd->ret < 0 ? BLK_STS_IOERR : BLK_STS_OK); } -static void lo_rw_aio_do_completion(struct loop_cmd *cmd) -{ - if (!atomic_dec_and_test(&cmd->ref)) - return; - kfree(cmd->bvec); - cmd->bvec = NULL; - blk_mq_complete_request(cmd->rq); -} - static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2) { struct loop_cmd *cmd = container_of(iocb, struct loop_cmd, iocb); @@ -479,7 +470,7 @@ static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2) if (cmd->css) css_put(cmd->css); cmd->ret = ret; - lo_rw_aio_do_completion(cmd); + blk_mq_complete_request(cmd->rq); } static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, @@ -527,7 +518,6 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, bvec = __bvec_iter_bvec(bio->bi_io_vec, bio->bi_iter); segments = bio_segments(bio); } - atomic_set(&cmd->ref, 2); iov_iter_bvec(&iter, ITER_BVEC | rw, bvec, segments, blk_rq_bytes(rq)); @@ -545,7 +535,12 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, else ret = call_read_iter(file, &cmd->iocb, &iter); - lo_rw_aio_do_completion(cmd); + /* + * Clear bvec to NULL as lo_rw_aio only allocates and sets it for + * the multiple bios per request case and we want a clean slate here. + */ + kfree(cmd->bvec); + cmd->bvec = NULL; kthread_associate_blkcg(NULL); if (ret != -EIOCBQUEUED) diff --git a/drivers/block/loop.h b/drivers/block/loop.h index 0f45416e4fcf..ba65848c7c33 100644 --- a/drivers/block/loop.h +++ b/drivers/block/loop.h @@ -68,7 +68,6 @@ struct loop_cmd { struct kthread_work work; struct request *rq; bool use_aio; /* use AIO interface to handle I/O */ - atomic_t ref; /* only for aio */ long ret; struct kiocb iocb; struct bio_vec *bvec;