From patchwork Fri Nov 21 10:08:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 5354021 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 211AAC11AC for ; Fri, 21 Nov 2014 10:15:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 40BAE20131 for ; Fri, 21 Nov 2014 10:15:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 632622010B for ; Fri, 21 Nov 2014 10:15:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758258AbaKUKPe (ORCPT ); Fri, 21 Nov 2014 05:15:34 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:48369 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755399AbaKUKPd (ORCPT ); Fri, 21 Nov 2014 05:15:33 -0500 Received: by mail-pa0-f51.google.com with SMTP id ey11so4619642pad.10 for ; Fri, 21 Nov 2014 02:15:33 -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=SCu1MZf5AJBBZe2iQb42VLGlQXVin99eLkH27Lg7liI=; b=iBPtoL+rtTL4/WeaRLVw25EJtiuqp6dlbwe7UguyeKqoxRCikXD0naLvvzWYygScfb Ln6ZmEJHlFH6vP49OAdaJ7mgUWRlj3HQxPR5YDnDgdKY1IaJOlToNnzq6mAugcCF4dOj PNqGbv7bQU1D3eagaYM4VM5rYj4IQB3jjK4C+TlsVyhbOupfwcwiGaUA7WGkZeih0khn Vg3vewnY7pdlyT13W9iCzPQkSXiOCuCt2HptFemQZXlFj//PS1/mxqR9gxNvjHw6ID3G /sBFPVp4k2JdxKqqJokmj3UlRFjir5we5SvCRzaGZJrxtZPuW1eDpovBKbhNT2Pc25MK MVPw== X-Gm-Message-State: ALoCoQm6R0rGVzXDeclaD2SpAmdPnY6J79Htmy5GH0wVccYrt/JSWNXLq06tSzoVOPn+GItzG3Nd X-Received: by 10.69.20.42 with SMTP id gz10mr5149556pbd.91.1416564549885; Fri, 21 Nov 2014 02:09:09 -0800 (PST) Received: from mew.localdomain ([24.19.133.29]) by mx.google.com with ESMTPSA id g12sm4391480pdj.27.2014.11.21.02.09.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Nov 2014 02:09:09 -0800 (PST) From: Omar Sandoval To: Alexander Viro , Andrew Morton , Chris Mason , Josef Bacik , linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, Trond Myklebust , Mel Gorman Cc: Omar Sandoval Subject: [PATCH v2 3/5] swap: use direct I/O for SWP_FILE swap_readpage Date: Fri, 21 Nov 2014 02:08:29 -0800 Message-Id: <455265ec2174096758e3d702a1e8c84aff46aa72.1416563833.git.osandov@osandov.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@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=ham 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 On Mon, Nov 17, 2014 at 07:48:17AM -0800, Christoph Hellwig wrote: > With the new iov_iter infrastructure that supprots direct I/O to kernel > pages please get rid of the ->readpage hack first. I'm still utterly > disapoined that this crap ever got merged. Cc: Mel Gorman Signed-off-by: Omar Sandoval --- mm/page_io.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 955db8b..10715e0 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -283,8 +283,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc, set_page_writeback(page); unlock_page(page); - ret = mapping->a_ops->direct_IO(ITER_BVEC | WRITE, - &kiocb, &from, + ret = mapping->a_ops->direct_IO(WRITE, &kiocb, &from, kiocb.ki_pos); if (ret == PAGE_SIZE) { count_vm_event(PSWPOUT); @@ -348,12 +347,37 @@ int swap_readpage(struct page *page) } if (sis->flags & SWP_FILE) { + struct kiocb kiocb; struct file *swap_file = sis->swap_file; struct address_space *mapping = swap_file->f_mapping; + struct bio_vec bv = { + .bv_page = page, + .bv_len = PAGE_SIZE, + .bv_offset = 0, + }; + struct iov_iter to = { + .type = ITER_BVEC | READ, + .count = PAGE_SIZE, + .iov_offset = 0, + .nr_segs = 1, + }; + to.bvec = &bv; /* older gcc versions are broken */ + + init_sync_kiocb(&kiocb, swap_file); + kiocb.ki_pos = page_file_offset(page); + kiocb.ki_nbytes = PAGE_SIZE; - ret = mapping->a_ops->readpage(swap_file, page); - if (!ret) + ret = mapping->a_ops->direct_IO(READ, &kiocb, &to, + kiocb.ki_pos); + if (ret == PAGE_SIZE) { + SetPageUptodate(page); count_vm_event(PSWPIN); + ret = 0; + } else { + ClearPageUptodate(page); + SetPageError(page); + } + unlock_page(page); return ret; }