From patchwork Sat Dec 20 03:18:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 5521931 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6F5769F1CD for ; Sat, 20 Dec 2014 03:20:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9485720154 for ; Sat, 20 Dec 2014 03:20:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0DD32014A for ; Sat, 20 Dec 2014 03:20:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752763AbaLTDSu (ORCPT ); Fri, 19 Dec 2014 22:18:50 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:46665 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752739AbaLTDSq (ORCPT ); Fri, 19 Dec 2014 22:18:46 -0500 Received: by mail-pa0-f54.google.com with SMTP id fb1so2377745pad.13 for ; Fri, 19 Dec 2014 19:18:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=CCZmng+dE1IoNCf03uLMetLGgwupvviVxq+6ukLZvyM=; b=hTQzeVc4CwJkkKep7XueH104hVeNu6k5zI+1mVuv7+Gn0uaoJRnuckDE0fkz+uz54H uOWTMn3+ME9a/V7t9BQIGmIxwElJ82iL54bzWuNWUG1UmUIFn1on9QNN8NqWYCO44bvb KVc1dhc3O6YFIVdOmeCH3pDGh5HA9G3KzwWh0rGx8SfIiTqwkSnNkwc8XtJvAExXQoHG iNT/IIKJGK/MibjKqSHfPh6wPEYaVE9FrTUcEzwKIerWHrqrL2hjlC0Ol0trDj30jJoI +Bitu3JA+VXP3q0FGq5ETZ68O8A2a6WrcpjDp5jwq4KMnTlU4rO2FDOlRcQjG0TnYmbf 4eIw== X-Gm-Message-State: ALoCoQnKEo3xdv/HyOitOhjtmRX+TSxdttcUG8CTOGkaWlGmVcKtUNy2d8AALahLj0iioLo0cN+J X-Received: by 10.68.65.112 with SMTP id w16mr17428460pbs.114.1419045525267; Fri, 19 Dec 2014 19:18:45 -0800 (PST) Received: from mew.localdomain ([72.192.100.38]) by mx.google.com with ESMTPSA id uq15sm10972638pab.8.2014.12.19.19.18.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Dec 2014 19:18:44 -0800 (PST) From: Omar Sandoval To: Alexander Viro , Andrew Morton , Trond Myklebust , Christoph Hellwig , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Omar Sandoval , Ming Lei Subject: [PATCH v2 2/5] direct-io: don't dirty ITER_BVEC pages on read Date: Fri, 19 Dec 2014 19:18:26 -0800 Message-Id: X-Mailer: git-send-email 2.2.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reads through the iov_iter infrastructure for kernel pages shouldn't be dirtied by the direct I/O code. This is based on Dave Kleikamp's and Ming Lei's previously posted patches. Cc: Ming Lei Acked-by: Dave Kleikamp Signed-off-by: Omar Sandoval --- fs/direct-io.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/direct-io.c b/fs/direct-io.c index e181b6b..c71387b 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -120,6 +120,7 @@ struct dio { spinlock_t bio_lock; /* protects BIO fields below */ int page_errors; /* errno from get_user_pages() */ int is_async; /* is IO async ? */ + int should_dirty; /* should we mark read pages dirty? */ bool defer_completion; /* defer AIO completion to workqueue? */ int io_error; /* IO error in completion path */ unsigned long refcount; /* direct_io_worker() and bios */ @@ -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,13 @@ 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); } @@ -1177,6 +1178,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, dio->inode = inode; dio->rw = rw; + dio->should_dirty = !iov_iter_is_bvec(iter); /* * For AIO O_(D)SYNC writes we need to defer completions to a workqueue