From patchwork Fri Apr 1 14:29:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weston Andros Adamson X-Patchwork-Id: 8725241 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B1CC69F3D1 for ; Fri, 1 Apr 2016 14:29:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DAC6B203B6 for ; Fri, 1 Apr 2016 14:29:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C03B203DC for ; Fri, 1 Apr 2016 14:29:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758984AbcDAO3N (ORCPT ); Fri, 1 Apr 2016 10:29:13 -0400 Received: from mail-io0-f180.google.com ([209.85.223.180]:33696 "EHLO mail-io0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757295AbcDAO3M (ORCPT ); Fri, 1 Apr 2016 10:29:12 -0400 Received: by mail-io0-f180.google.com with SMTP id a129so145288576ioe.0 for ; Fri, 01 Apr 2016 07:29:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=primarydata-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=c+T6Re9MJv7ok0hZ3RtbrVRFGTO5CCvEOvPoehUP0m0=; b=X4uqlexIya50D7peNJnI4gdfrb/Xfmq6LqXPw0QOMy/uImsPX6vtHXi6U4/U9SsyWT ICW5ndujZoTNOl6xuVCI14ZPt9+5VYF5fpkPVS+Z81di/GzwlScQIz1v8FdrOAnHmFp8 +L7+MwVNPYKD+pCS3icwkpieKTg+eKlLGxm3aNV70D1etTNHOoS9U3lRxfxOcmMhIi3C S0e8FwO/5N7qnPIvOZJBjSGN+t2GBBQNsfjhjIJ4o65CmHgYEW2fEsS4KKzxZPDCIHNe 3n+LbUioOrPkrQMv6XPYJcvc8wAGpE29saV0FPwsrv/9C/ld+CUXDSNP1BosQxY2ByO4 PhWg== 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; bh=c+T6Re9MJv7ok0hZ3RtbrVRFGTO5CCvEOvPoehUP0m0=; b=WISOx3iuN/UTohYtzTgFbuUZUlcP99MbYacExn91Bl3WxARaKJwfKCnyrXxxtIs9Kp 4zhziPITUcmF3mg0bjmpO4VnltPjuznFaaTHjjXB1r4apSsI7KxfAmmMemXMz+vPyvpl x1+VLLbYD87rrjsL8H7b5CyQQefsprIOHNjBrMb0m9i3INJLhoFNBMRqjyZGfTR9nl8H ZK3WMVRCTbFe27YIL7TGeelYy69IZ6m+It1NJ78ZHrGE/btvpThD0MznX7znK0NjR0VS aZKq8H5oGFuXtw+UpJ7RkmvWthNQTFtjlKnYFs1uxkb9Ak0Al9eRUNkU6GIdtG//ukFG xqwg== X-Gm-Message-State: AD7BkJLv6mM7GSrKqYo008dxIhPmZuV/szZ8/nMhHQO+svUwhbtksAX7uRBjXATCDuM/3HAw X-Received: by 10.107.163.4 with SMTP id m4mr4580837ioe.79.1459520951220; Fri, 01 Apr 2016 07:29:11 -0700 (PDT) Received: from dhcp-56.robotsandstuff.fake (c-68-49-175-159.hsd1.mi.comcast.net. [68.49.175.159]) by smtp.gmail.com with ESMTPSA id 78sm5887454iof.22.2016.04.01.07.29.10 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Apr 2016 07:29:10 -0700 (PDT) From: Weston Andros Adamson To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH 1/2] pnfs: set NFS_IOHDR_REDO in pnfs_read_resend_pnfs Date: Fri, 1 Apr 2016 10:29:02 -0400 Message-Id: <1459520943-5558-2-git-send-email-dros@primarydata.com> X-Mailer: git-send-email 2.6.4 (Apple Git-63) In-Reply-To: <1459520943-5558-1-git-send-email-dros@primarydata.com> References: <1459520943-5558-1-git-send-email-dros@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Like other resend paths, mark the (old) hdr as NFS_IOHDR_REDO. This ensures the hdr completion function will not count the (old) hdr as good bytes. Also, vector the error back through the hdr->task.tk_status like other retry calls. This fixes a bug with the FlexFiles layout where libaio was reporting more bytes read than requested. Signed-off-by: Weston Andros Adamson --- fs/nfs/pnfs.c | 13 ++++++++----- fs/nfs/pnfs.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 2fa483e6dbe2..da90d665b01f 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -2143,12 +2143,15 @@ pnfs_try_to_read_data(struct nfs_pgio_header *hdr, } /* Resend all requests through pnfs. */ -int pnfs_read_resend_pnfs(struct nfs_pgio_header *hdr) +void pnfs_read_resend_pnfs(struct nfs_pgio_header *hdr) { struct nfs_pageio_descriptor pgio; - nfs_pageio_init_read(&pgio, hdr->inode, false, hdr->completion_ops); - return nfs_pageio_resend(&pgio, hdr); + if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) { + nfs_pageio_init_read(&pgio, hdr->inode, false, + hdr->completion_ops); + hdr->task.tk_status = nfs_pageio_resend(&pgio, hdr); + } } EXPORT_SYMBOL_GPL(pnfs_read_resend_pnfs); @@ -2162,8 +2165,8 @@ pnfs_do_read(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr) trypnfs = pnfs_try_to_read_data(hdr, call_ops, lseg); if (trypnfs == PNFS_TRY_AGAIN) - err = pnfs_read_resend_pnfs(hdr); - if (trypnfs == PNFS_NOT_ATTEMPTED || err) + pnfs_read_resend_pnfs(hdr); + if (trypnfs == PNFS_NOT_ATTEMPTED || hdr->task.tk_status) pnfs_read_through_mds(desc, hdr); } diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 1ac1db5f6dad..7222d3a35439 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -282,7 +282,7 @@ int _pnfs_return_layout(struct inode *); int pnfs_commit_and_return_layout(struct inode *); void pnfs_ld_write_done(struct nfs_pgio_header *); void pnfs_ld_read_done(struct nfs_pgio_header *); -int pnfs_read_resend_pnfs(struct nfs_pgio_header *); +void pnfs_read_resend_pnfs(struct nfs_pgio_header *); struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino, struct nfs_open_context *ctx, loff_t pos,