From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755438AbaHNPvf (ORCPT ); Thu, 14 Aug 2014 11:51:35 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:52961 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754953AbaHNPvc (ORCPT ); Thu, 14 Aug 2014 11:51:32 -0400 From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org, Andrew Morton , Dave Kleikamp Cc: Zach Brown , Benjamin LaHaise , Christoph Hellwig , Kent Overstreet , linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, Dave Chinner , Ming Lei , Alexander Viro Subject: [PATCH v1 2/9] fd/direct-io: introduce should_dirty for kernel aio Date: Thu, 14 Aug 2014 23:50:33 +0800 Message-Id: <1408031441-31156-3-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1408031441-31156-1-git-send-email-ming.lei@canonical.com> References: <1408031441-31156-1-git-send-email-ming.lei@canonical.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For pages from kernel AIO, it is required to dirty them before direct IO. The idea is borrowd from Dave previous post. Cc: Zach Brown Cc: Dave Kleikamp Cc: Benjamin LaHaise Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Ming Lei --- fs/direct-io.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/direct-io.c b/fs/direct-io.c index c311640..f0460e0 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -121,6 +121,7 @@ struct dio { int page_errors; /* errno from get_user_pages() */ int is_async; /* is IO async ? */ bool defer_completion; /* defer AIO completion to workqueue? */ + bool should_dirty; /* if page should be dirty */ int io_error; /* IO error in completion path */ unsigned long refcount; /* direct_io_worker() and bios */ struct bio *bio_list; /* singly linked via bi_private */ @@ -392,7 +393,7 @@ static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio) dio->refcount++; spin_unlock_irqrestore(&dio->bio_lock, flags); - if (dio->is_async && dio->rw == READ) + if (dio->is_async && dio->rw == READ && dio->should_dirty) bio_set_pages_dirty(bio); if (sdio->submit_io) @@ -463,13 +464,14 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio) if (!uptodate) dio->io_error = -EIO; - if (dio->is_async && dio->rw == READ) { + if (dio->is_async && dio->rw == READ && dio->should_dirty) { bio_check_pages_dirty(bio); /* transfers ownership */ } else { bio_for_each_segment_all(bvec, bio, i) { struct page *page = bvec->bv_page; - if (dio->rw == READ && !PageCompound(page)) + if (dio->rw == READ && !PageCompound(page) && + dio->should_dirty) set_page_dirty_lock(page); page_cache_release(page); } @@ -1217,6 +1219,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, spin_lock_init(&dio->bio_lock); dio->refcount = 1; + dio->should_dirty = !is_kernel_kiocb(iocb); sdio.iter = iter; sdio.final_block_in_request = -- 1.7.9.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ming Lei Subject: [PATCH v1 2/9] fd/direct-io: introduce should_dirty for kernel aio Date: Thu, 14 Aug 2014 23:50:33 +0800 Message-ID: <1408031441-31156-3-git-send-email-ming.lei@canonical.com> References: <1408031441-31156-1-git-send-email-ming.lei@canonical.com> Cc: Zach Brown , Benjamin LaHaise , Christoph Hellwig , Kent Overstreet , linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, Dave Chinner , Ming Lei , Alexander Viro To: Jens Axboe , linux-kernel@vger.kernel.org, Andrew Morton , Dave Kleikamp Return-path: In-Reply-To: <1408031441-31156-1-git-send-email-ming.lei@canonical.com> Sender: owner-linux-aio@kvack.org List-Id: linux-fsdevel.vger.kernel.org For pages from kernel AIO, it is required to dirty them before direct IO. The idea is borrowd from Dave previous post. Cc: Zach Brown Cc: Dave Kleikamp Cc: Benjamin LaHaise Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Ming Lei --- fs/direct-io.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/direct-io.c b/fs/direct-io.c index c311640..f0460e0 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -121,6 +121,7 @@ struct dio { int page_errors; /* errno from get_user_pages() */ int is_async; /* is IO async ? */ bool defer_completion; /* defer AIO completion to workqueue? */ + bool should_dirty; /* if page should be dirty */ int io_error; /* IO error in completion path */ unsigned long refcount; /* direct_io_worker() and bios */ struct bio *bio_list; /* singly linked via bi_private */ @@ -392,7 +393,7 @@ static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio) dio->refcount++; spin_unlock_irqrestore(&dio->bio_lock, flags); - if (dio->is_async && dio->rw == READ) + if (dio->is_async && dio->rw == READ && dio->should_dirty) bio_set_pages_dirty(bio); if (sdio->submit_io) @@ -463,13 +464,14 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio) if (!uptodate) dio->io_error = -EIO; - if (dio->is_async && dio->rw == READ) { + if (dio->is_async && dio->rw == READ && dio->should_dirty) { bio_check_pages_dirty(bio); /* transfers ownership */ } else { bio_for_each_segment_all(bvec, bio, i) { struct page *page = bvec->bv_page; - if (dio->rw == READ && !PageCompound(page)) + if (dio->rw == READ && !PageCompound(page) && + dio->should_dirty) set_page_dirty_lock(page); page_cache_release(page); } @@ -1217,6 +1219,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, spin_lock_init(&dio->bio_lock); dio->refcount = 1; + dio->should_dirty = !is_kernel_kiocb(iocb); sdio.iter = iter; sdio.final_block_in_request = -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to majordomo@kvack.org. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: aart@kvack.org