From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752700AbbAMPpu (ORCPT ); Tue, 13 Jan 2015 10:45:50 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:56829 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752298AbbAMPpr (ORCPT ); Tue, 13 Jan 2015 10:45:47 -0500 From: Ming Lei To: linux-kernel@vger.kernel.org, Dave Kleikamp Cc: Jens Axboe , Zach Brown , Christoph Hellwig , Maxim Patlasov , Andrew Morton , Alexander Viro , Benjamin LaHaise , Ming Lei , Omar Sandoval , linux-fsdevel@vger.kernel.org Subject: [PATCH v2 2/4] fd/direct-io: introduce should_dirty for kernel aio Date: Tue, 13 Jan 2015 23:44:46 +0800 Message-Id: <1421163888-21452-3-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1421163888-21452-1-git-send-email-ming.lei@canonical.com> References: <1421163888-21452-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. Also set ->should_dirty only for ITER_IOVEC pages based on recent discussion in following link: http://marc.info/?t=141904556800003&r=1&w=2 Cc: Maxim Patlasov Cc: Omar Sandoval 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 e181b6b..4dd6d14 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 = iter_is_iovec(iter); sdio.iter = iter; sdio.final_block_in_request = -- 1.7.9.5