From patchwork Thu Sep 13 23:37:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 1454691 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2A8E1DF24C for ; Thu, 13 Sep 2012 23:37:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759057Ab2IMXhs (ORCPT ); Thu, 13 Sep 2012 19:37:48 -0400 Received: from natasha.panasas.com ([67.152.220.90]:36118 "EHLO natasha.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759038Ab2IMXhr (ORCPT ); Thu, 13 Sep 2012 19:37:47 -0400 Received: from zenyatta.panasas.com (zenyatta.int.panasas.com [172.17.28.63]) by natasha.panasas.com (8.13.1/8.13.1) with ESMTP id q8DNbj69012789; Thu, 13 Sep 2012 19:37:45 -0400 Received: from localhost (172.17.142.245) by zenyatta.int.panasas.com (172.17.28.63) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 13 Sep 2012 19:37:03 -0400 From: Boaz Harrosh To: Benny Halevy , NFS list , open-osd Subject: [PATCH 07/10] SQUASHME: pnfsd: Something very wrong with layout_recall(RETURN_FILE) Date: Fri, 14 Sep 2012 02:37:34 +0300 Message-ID: <1347579454-21650-1-git-send-email-bharrosh@panasas.com> X-Mailer: git-send-email 1.7.10.2.677.gb6bc67f In-Reply-To: <50526B39.3000802@panasas.com> References: <50526B39.3000802@panasas.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org In patch: pnfsd: layout recall layout state the cl_has_file_layout() is no longer inspecting the layout structures added per file but is inspecting if file has layout_state. So it is counting layout_states and not layouts This is bad because the addition of the layout_states on the file is done before the call to the filesystem so if the FS does a recall, the nfsd is confused thinking it already has a layout and issues a recall. Instead of returning -ENOENT, ie list is empty. The client then truly returns nomaching_layout and when the lo_return(s) are emulated the system gets stuck is some reference miss-match. (UML so no crash trace) Now lets say that the state should be set before the call to the FS. Then I don't see where the state is removed in the case of an ERROR return from FS->layout_get. Meaning cl_has_file_layout() will always think it has some count. Also When a layout is returned it is the layout list that is inspected and freed, so how is the cl_has_file_layout() emptied ? In any way. I do not agree that it is the state that is needed to be searched in cl_has_file_layout() but it is layouts that are needed, otherwise the all layout <---> recall very delicate dance is totally broken. What was the meaning of the Poet? I reverted the cl_has_file_layout() to historical processing. Also cl_has_file_layout() returns true for any layout on a file, but we must inspect IO_MODE and LSEG for a partial-match, as well. The below works for me. State also looks good. I can now safely call cb_recall, from within a layout_get operation. Signed-off-by: Boaz Harrosh --- fs/nfsd/nfs4pnfsd.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/fs/nfsd/nfs4pnfsd.c b/fs/nfsd/nfs4pnfsd.c index e8e7709..523d3d0 100644 --- a/fs/nfsd/nfs4pnfsd.c +++ b/fs/nfsd/nfs4pnfsd.c @@ -1177,24 +1177,27 @@ out: } static bool -cl_has_file_layout(struct nfs4_client *clp, struct nfs4_file *fp, stateid_t *lsid) +cl_has_file_layout(struct nfs4_client *clp, struct nfs4_file *fp, + stateid_t *lsid, struct nfsd4_pnfs_cb_layout *cbl) { - struct nfs4_layout_state *ls; + struct nfs4_layout *lo; + bool ret = false; spin_lock(&layout_lock); - list_for_each_entry (ls, &fp->fi_layout_states, ls_perfile) - if (same_clid(&ls->ls_stid.sc_stateid.si_opaque.so_clid, - &clp->cl_clientid)) { + list_for_each_entry(lo, &fp->fi_layouts, lo_perfile) { + if (same_clid(&lo->lo_client->cl_clientid, &clp->cl_clientid) && + lo_seg_overlapping(&cbl->cbl_seg, &lo->lo_seg) && + (cbl->cbl_seg.iomode & lo->lo_seg.iomode)) goto found; - } - spin_unlock(&layout_lock); - return false; - + } + goto unlock; found: - update_layout_stateid_locked(ls, lsid); + /* Im going to send a recall on this latout update state */ + update_layout_stateid_locked(lo->lo_state, lsid); + ret = true; +unlock: spin_unlock(&layout_lock); - - return true; + return ret; } static int @@ -1226,7 +1229,7 @@ cl_has_layout(struct nfs4_client *clp, struct nfsd4_pnfs_cb_layout *cbl, { switch (cbl->cbl_recall_type) { case RETURN_FILE: - return cl_has_file_layout(clp, lrfile, lsid); + return cl_has_file_layout(clp, lrfile, lsid, cbl); case RETURN_FSID: return cl_has_fsid_layout(clp, &cbl->cbl_fsid); default: