From patchwork Thu Aug 9 02:30:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 1298551 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 88B623FD8D for ; Thu, 9 Aug 2012 02:30:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752906Ab2HICaY (ORCPT ); Wed, 8 Aug 2012 22:30:24 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:51800 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752269Ab2HICaX (ORCPT ); Wed, 8 Aug 2012 22:30:23 -0400 Received: by pbbrr13 with SMTP id rr13so90540pbb.19 for ; Wed, 08 Aug 2012 19:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=ivYrobA8BiENej9NNbCzrIxYqae+50jwXuGPEfbeLkE=; b=IDP9WYm07yF7lwmoZrexba88V/B2koKjZkel2liq6StatGUqsdpastmrn9E5MA9lM4 Y90VW+xU++kce7577fcbAOGL38D0Um6FjC0A2bDt03wqUBVfBDidZWzDNVGxpu4IgZUW 7hNLXGF7SbAi6UofDpcwRwcATI0fhpW6GoySsnzJNSZC+3hZyWyPOrij7V+y+YkOGrFw Z1EYvVOxq/TbZ4sxMGUPNHABKmhGXcMva7y5Lm8fqNtR65vGs1Ah3g3EFld+lJSjAJ5L Nt7oIzb3ItkORfF3Imtw5tjXZ7e6cI5m4kQhFi86/id+lpIiW9lmeYW6sZMYc/lH264U 389w== Received: by 10.68.242.228 with SMTP id wt4mr195430pbc.89.1344479422547; Wed, 08 Aug 2012 19:30:22 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.26.1 with HTTP; Wed, 8 Aug 2012 19:30:02 -0700 (PDT) In-Reply-To: <1344452224.8925.30.camel@lade.trondhjem.org> References: <1344391392-1948-1-git-send-email-bergwolf@gmail.com> <1344391392-1948-4-git-send-email-bergwolf@gmail.com> <1344452224.8925.30.camel@lade.trondhjem.org> From: Peng Tao Date: Thu, 9 Aug 2012 10:30:02 +0800 Message-ID: Subject: Re: [PATCH RFC 3/3] NFS41: send real read size in layoutget for DIO To: "Myklebust, Trond" Cc: "bharrosh@panasas.com" , "linux-nfs@vger.kernel.org" Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org On Thu, Aug 9, 2012 at 2:57 AM, Myklebust, Trond wrote: > On Wed, 2012-08-08 at 10:03 +0800, Peng Tao wrote: >> From: Peng Tao >> >> We don't have the real IO size information in buffer read, but for direct >> read, we can get it from dreq->bytes_left. Let's make use of it. > > What's wrong with using the nfs_readpages arguments? The readahead code > will tell you exactly how many pages it is trying to read. > The nr_pages information gets dropped before calling into pnfs code... How about something like bellow for buffer reads? (untested patch and needs to integrate with DIO size for sure). nfs_pageio_complete(&pgio); diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 2e00fea..cec79c2 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1162,7 +1162,7 @@ pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *r pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, req->wb_context, req_offset(req), - req->wb_bytes, + (unsigned)pgio->pg_layout_private, IOMODE_READ, GFP_KERNEL); /* If no lseg, fall back to read through mds */ diff --git a/fs/nfs/read.c b/fs/nfs/read.c index b6bdb18..64fb0e2 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -649,6 +649,7 @@ int nfs_readpages(struct file *filp, struct address_space *mapping, NFS_PROTO(inode)->read_pageio_init(&pgio, inode, &nfs_async_read_completion_ops); + pgio.pg_layout_private = (void *)nr_pages; ret = read_cache_pages(mapping, pages, readpage_async_filler, &desc);