From patchwork Tue May 17 16:28:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9114211 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6D594BF29F for ; Tue, 17 May 2016 16:29:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7FBA9201B9 for ; Tue, 17 May 2016 16:29:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E02E202F0 for ; Tue, 17 May 2016 16:29:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755818AbcEQQ27 (ORCPT ); Tue, 17 May 2016 12:28:59 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:34421 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755827AbcEQQ25 (ORCPT ); Tue, 17 May 2016 12:28:57 -0400 Received: by mail-qk0-f194.google.com with SMTP id i7so1933384qkd.1 for ; Tue, 17 May 2016 09:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HtwKMED5OurOwRm2niJG8uITRzGWCuqnXzQToj70Tos=; b=GnvqcKxLvtCfSdIUPq3HGhgLQpjan5urMGJWcMN/Cp51hAbCXzQW5r74aVd8Gu+3Pm zfK01aQyzAsKi30KUERxlWBq0ImyKijZJlieEaGI1wO4zTVEV4LKUFSC2juACXen7Z8+ np6YvbaZp7qE3OsYe8cK5kRwBxRh/YiNt/xwHftGN3ZWozGjj2SfoMgeCPPY522sDDI9 UgvUrkdn936XNq7ivpouRLBpwDqaVLzWk4D9Qb6ke+LQVKpMmbPaVO9w9OU4oZl0XmHy Ciq1YLwrIo+EUf9ZRCkMIbI5mEhfn7FO+iS2hBf96TlLyfgD+p0xLRqJM9ml00LWByW4 h03Q== 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=HtwKMED5OurOwRm2niJG8uITRzGWCuqnXzQToj70Tos=; b=D6Wyjbx8HVj4cIMZpLZaq5dfxaUtamrLr0sW3fcJ8hDZf34Z85ROp0CKiwI3g/ccBT b4p3Fr5MKd0Bd9uJkGO4E4nvWc0xl3VF1WQhavBfROgJ9LlY1WajW19LjucoYg5d0MLq mJMgMABnqWd7rVF26NUCHbv3T0WRtk/xHHC8MjNPDiKuH1Z3+WPuJmt/AhakHN4eyiTT DSdelow/7T6vcM6O+3yvNW+ye/wLT/RSNz45/1vTps4J/VnHNcyezQ69v8q3Pvo5hwiE b6QgjP+rMfx730q2kwbuPWxZfiE92jH1QhxvgEhGp5dTchXb3eXTfgrIETP4DgA1w2JE 8sYQ== X-Gm-Message-State: AOPr4FW/Io+RamV54ymcMKm6NNa8+7co9n9GJGbAeP8eWedGSXvnw4UdCwyDKY6avU8F4Q== X-Received: by 10.55.65.74 with SMTP id o71mr2718758qka.133.1463502536716; Tue, 17 May 2016 09:28:56 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:4074:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id a31sm1685827qga.34.2016.05.17.09.28.55 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 May 2016 09:28:56 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: Trond Myklebust , Anna Schumaker Cc: Thomas Haynes , linux-nfs@vger.kernel.org, hch@lst.de Subject: [PATCH v4 01/13] pNFS/flexfile: Fix erroneous fall back to read/write through the MDS Date: Tue, 17 May 2016 12:28:36 -0400 Message-Id: <1463502528-11519-2-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1463502528-11519-1-git-send-email-jeff.layton@primarydata.com> References: <1463502528-11519-1-git-send-email-jeff.layton@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=-8.2 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 From: Trond Myklebust This patch fixes a problem whereby the pNFS client falls back to doing reads and writes through the metadata server even when the layout flag FF_FLAGS_NO_IO_THRU_MDS is set. Signed-off-by: Trond Myklebust --- fs/nfs/flexfilelayout/flexfilelayout.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 60d690dbc947..51f6660a2247 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -1294,7 +1294,7 @@ ff_layout_set_layoutcommit(struct nfs_pgio_header *hdr) } static bool -ff_layout_reset_to_mds(struct pnfs_layout_segment *lseg, int idx) +ff_layout_device_unavailable(struct pnfs_layout_segment *lseg, int idx) { /* No mirroring for now */ struct nfs4_deviceid_node *node = FF_LAYOUT_DEVID_NODE(lseg, idx); @@ -1331,16 +1331,10 @@ static int ff_layout_read_prepare_common(struct rpc_task *task, rpc_exit(task, -EIO); return -EIO; } - if (ff_layout_reset_to_mds(hdr->lseg, hdr->pgio_mirror_idx)) { - dprintk("%s task %u reset io to MDS\n", __func__, task->tk_pid); - if (ff_layout_has_available_ds(hdr->lseg)) - pnfs_read_resend_pnfs(hdr); - else - ff_layout_reset_read(hdr); - rpc_exit(task, 0); + if (ff_layout_device_unavailable(hdr->lseg, hdr->pgio_mirror_idx)) { + rpc_exit(task, -EHOSTDOWN); return -EAGAIN; } - hdr->pgio_done_cb = ff_layout_read_done_cb; ff_layout_read_record_layoutstats_start(task, hdr); return 0; @@ -1530,14 +1524,8 @@ static int ff_layout_write_prepare_common(struct rpc_task *task, return -EIO; } - if (ff_layout_reset_to_mds(hdr->lseg, hdr->pgio_mirror_idx)) { - bool retry_pnfs; - - retry_pnfs = ff_layout_has_available_ds(hdr->lseg); - dprintk("%s task %u reset io to %s\n", __func__, - task->tk_pid, retry_pnfs ? "pNFS" : "MDS"); - ff_layout_reset_write(hdr, retry_pnfs); - rpc_exit(task, 0); + if (ff_layout_device_unavailable(hdr->lseg, hdr->pgio_mirror_idx)) { + rpc_exit(task, -EHOSTDOWN); return -EAGAIN; } @@ -1754,6 +1742,7 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr) dprintk("%s USE DS: %s cl_count %d vers %d\n", __func__, ds->ds_remotestr, atomic_read(&ds->ds_clp->cl_count), vers); + hdr->pgio_done_cb = ff_layout_read_done_cb; atomic_inc(&ds->ds_clp->cl_count); hdr->ds_clp = ds->ds_clp; fh = nfs4_ff_layout_select_ds_fh(lseg, idx);