From patchwork Sat Jan 24 14:33:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 5699681 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 E19A19F305 for ; Sat, 24 Jan 2015 14:33:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0045E20260 for ; Sat, 24 Jan 2015 14:33:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ECBB3201CE for ; Sat, 24 Jan 2015 14:33:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752473AbbAXOdf (ORCPT ); Sat, 24 Jan 2015 09:33:35 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:33509 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752292AbbAXOdf (ORCPT ); Sat, 24 Jan 2015 09:33:35 -0500 Received: by mail-pa0-f50.google.com with SMTP id rd3so2881545pab.9 for ; Sat, 24 Jan 2015 06:33:34 -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; bh=Z77IXjn12o7nxtU9YNwvmcu2bcc+oyHqKH19dvW2sAU=; b=gI1ViFkAvH1N/ZFODzxIB9mJEs3T96SHupCnQDP7BvaCAlAQLllXAmqJXh07ACWNLn 7NOx/iPpaL/4RwyHhNY5V6xljkfs3t1WK6td0QS/IirJ+dvnIvZZ6sKB/j2oTep5AdJa /lxYRUTkB2np0vZX1N0ApETAfGs+EXapqo5tY/TMFMhLzDEMTcgiX6ZJU87dq+uPc9Sr VEtwuoX/4WmvmMNYHuPKMPiezy+ZjnB7QgwaA0ziwAE056I9jHImYkqOuRPlYzRhLnXm Afa6lB+dJoyuSIRiTWpm7An+02EA0L3KtSmWtsdQCK6vCBxM0zPmr0kiTFI8Hu2eCThW /TtQ== X-Gm-Message-State: ALoCoQk7Drtvjf4pQE+se1+f+4mRedcwQY+8UihUbV74VTRJQTYDzVa8jncNVgtDgVjSvad45RL4 X-Received: by 10.66.235.200 with SMTP id uo8mr19658870pac.108.1422110014486; Sat, 24 Jan 2015 06:33:34 -0800 (PST) Received: from localhost.localdomain (ec2-54-65-164-9.ap-northeast-1.compute.amazonaws.com. [54.65.164.9]) by mx.google.com with ESMTPSA id ej9sm5011631pdb.1.2015.01.24.06.33.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 24 Jan 2015 06:33:33 -0800 (PST) From: Peng Tao To: Christoph Hellwig Cc: Trond Myklebust , Linux NFS Mailing list , Tom Haynes Subject: Hi Christoph, Date: Sat, 24 Jan 2015 22:33:10 +0800 Message-Id: <1422109990-4032-1-git-send-email-tao.peng@primarydata.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20150123082705.GA17608@infradead.org> References: <20150123082705.GA17608@infradead.org> 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=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 Does following patch fix the warning and hang for you? I tested it locally on top of your flexfiles+pnfsd branch (tip 4f7961eb6) and xfstest generic/001 passed. Cheers, Tao From 47bc1a0ffc586ea96c99e453efd7e2435454b486 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Sat, 24 Jan 2015 22:14:52 +0800 Subject: [PATCH] nfs41: .init_read and .init_write can be called with valid pg_lseg With pgio refactoring in v3.15, .init_read and .init_write can be called with valid pgio->pg_lseg. file layout was fixed at that time by commit c6194271f (pnfs: filelayout: support non page aligned layouts). But the generic helper still needs to be fixed. Cc: stable@vger.kernel.org # 3.15+ Signed-off-by: Peng Tao --- fs/nfs/pnfs.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 0fb0f19..c7be9b9 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1711,19 +1711,19 @@ pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *r { u64 rd_size = req->wb_bytes; - WARN_ON_ONCE(pgio->pg_lseg != NULL); - - if (pgio->pg_dreq == NULL) - rd_size = i_size_read(pgio->pg_inode) - req_offset(req); - else - rd_size = nfs_dreq_bytes_left(pgio->pg_dreq); - - pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, - req->wb_context, - req_offset(req), - rd_size, - IOMODE_READ, - GFP_KERNEL); + if (pgio->pg_lseg == NULL) { + if (pgio->pg_dreq == NULL) + rd_size = i_size_read(pgio->pg_inode) - req_offset(req); + else + rd_size = nfs_dreq_bytes_left(pgio->pg_dreq); + + pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, + req->wb_context, + req_offset(req), + rd_size, + IOMODE_READ, + GFP_KERNEL); + } /* If no lseg, fall back to read through mds */ if (pgio->pg_lseg == NULL) nfs_pageio_reset_read_mds(pgio); @@ -1735,14 +1735,13 @@ void pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *req, u64 wb_size) { - WARN_ON_ONCE(pgio->pg_lseg != NULL); - - pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, - req->wb_context, - req_offset(req), - wb_size, - IOMODE_RW, - GFP_NOFS); + if (pgio->pg_lseg == NULL) + pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, + req->wb_context, + req_offset(req), + wb_size, + IOMODE_RW, + GFP_NOFS); /* If no lseg, fall back to write through mds */ if (pgio->pg_lseg == NULL) nfs_pageio_reset_write_mds(pgio);