Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp1544263rwb; Thu, 19 Jan 2023 12:04:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXvR9OCmkjCsroA+vl19w1B9927KQf8HYnP5VlO1T+G5dRdakPoyDCZRRqf55ot0elKHMJH1 X-Received: by 2002:a05:6402:5110:b0:499:8849:5fb3 with SMTP id m16-20020a056402511000b0049988495fb3mr15913613edd.31.1674158684854; Thu, 19 Jan 2023 12:04:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674158684; cv=none; d=google.com; s=arc-20160816; b=BSz0SRy7CjYQc7Al1YsbPEcIVWy3h//gVKBysmpCwijerCv+3mG0E9Y+ObBhwB4UXL wnunVJHaIgS5t10LfHlSExlCe62g6pNczXbqgUp9RCCGL7PGyxp0CiLNSMMPPQfFaQ/y +aWFfa5WosW/mgKmbiCTaXr7A/OaWGiRKp99sfJOBCLMZWwsv0mX2XPrpjr8PeqyW9GD U1O48LCW9aSv3IUwktDH6Fe8X0RvfXDpUTb7bSXZCvguMzhLGjUey5wmrN7CV/AbMfMJ +gGG3veXIuZVXoP70/C6XeFV/sNE6dUGvIYyWSYpBETJ1lRt7vvTBdYcdnHX4jDNYUDF vOnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=8KONNU3M5iye4R6ERz57Ll2LImdcXCbtSGNfCYPSxo4=; b=PL0U0zru6l0esTR4Bgkfd7hulKah8rKlrANs1T2I7iBnzu06nwjX0XPaGPC5S4Sie3 9cI6WjQQZpFfCjTf0zrKEE3Xc8W2iVS3nxXelFwVbnHdBmuo24Z2pIhSBMXz6EDqa8sV uDEaIGwbF+lBlTJqW8pK3gPkLn3QTMNbFMyKFMvPTVoJQ2rK7M6mGEJHe7wa9ci0B1G7 6cMdWq5KGd+n5bfw95bGnkCSSt8bWnC8aevx91SUt3eX7z7v6zwkcLWIIuGRUnEXtvZY MPK9DStpJMzy3+5nSsogNSj1pBIgTN5fCjuS+1B7e5BcFN89bFQeawzwz6IL3nFgp8h2 bGyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="g+p0/84X"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g14-20020a056402320e00b0049db071cacasi18698107eda.349.2023.01.19.12.04.18; Thu, 19 Jan 2023 12:04:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="g+p0/84X"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230496AbjASTkt (ORCPT + 99 others); Thu, 19 Jan 2023 14:40:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230322AbjASTkt (ORCPT ); Thu, 19 Jan 2023 14:40:49 -0500 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 584A59373D for ; Thu, 19 Jan 2023 11:40:48 -0800 (PST) Received: by mail-pg1-x536.google.com with SMTP id v3so2397500pgh.4 for ; Thu, 19 Jan 2023 11:40:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=8KONNU3M5iye4R6ERz57Ll2LImdcXCbtSGNfCYPSxo4=; b=g+p0/84XbWuqF0pVYaQs68mOUz23db/1Hv2BsuuAsK6R/GzPOfL9hVE/erNybBqthT PNe2rxtl+Xph+YR601Wavf6X1SawuIy2NrPbma4lwbeB7TLeyVCCfmNwlW6WmHgIaC8g NAbKMG3R6uTrblVA27BaVMkRbNMWzlJGUkpCrDXuCFEGa8en4mPQedQVelkkbfg8WS1/ 53gbKctChu8QFjxgmj/TUi0nv7jOGMkKPH2SoWc+IoWRn6cIxZ4lAFMORBAIlTKpvgvC Yh4EFuwspub/BChrYpNsnOgI4qV/86DJW/fcvgIdc0cGzSppEA9Z1Cn+ykbQKhs3ku1p vIWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8KONNU3M5iye4R6ERz57Ll2LImdcXCbtSGNfCYPSxo4=; b=ppgdUTr0yJ2mgntE8oR/6aggLo6P/zrfOGBJNL8XgsjlLq8Fir5v2oxs+QBDvl4Csu fG/Xwf++2Pmokh7QAxlqyXuR09dnDTeUme+cJ+fNWQab2igP0mdFgDwJDsJUesoEaStg H5WExK/7fteltREOMyJQ5xVqLy1bRRJma1JWSlXsUZ8/4GPKe3HiGb1jOqJo6ylmbKYd guZ9+YouVK8fvrfELwcBBGK7ZUiO9bNNGlEyB/KfBVjD3pvAprD/aw+/5T1OQC1C3LVP /3pwKLUssETrz6cWHTeAG/SLF6Mht/y8knzx4yjfa8C/yCsLE5IsnCzapeWUGNjm41y5 yfmg== X-Gm-Message-State: AFqh2krPPkjA5XJlABNJ0HGMbOnbp17zC5zmKwKPeR+GB7XhnCy2was3 7msteBkRNuRjCr5xb+/Cg+2hKMXReswAudaRtraVB91vZzM= X-Received: by 2002:a62:1b0a:0:b0:58d:8e62:6c0b with SMTP id b10-20020a621b0a000000b0058d8e626c0bmr1159251pfb.42.1674157247726; Thu, 19 Jan 2023 11:40:47 -0800 (PST) MIME-Version: 1.0 References: <20230119175010.57814-1-olga.kornievskaia@gmail.com> In-Reply-To: From: Olga Kornievskaia Date: Thu, 19 Jan 2023 14:40:36 -0500 Message-ID: Subject: Re: [PATCH 1/1] pNFS/filelayout: treat GETDEVICEINFO errors as LAYOUTUNAVAILABLE To: Trond Myklebust Cc: Anna Schumaker , "linux-nfs@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org On Thu, Jan 19, 2023 at 1:24 PM Trond Myklebust w= rote: > > > > > On Jan 19, 2023, at 12:50, Olga Kornievskaia wrote: > > > > If the call to GETDEVICEINFO fails, the client fallback to doing IO > > to MDS but on every new IO call, the client tries to get the device > > again. Instead, mark the layout as unavailable as well. This way > > the client will re-try after a timeout period. > > > > Signed-off-by: Olga Kornievskaia > > --- > > fs/nfs/filelayout/filelayout.c | 1 + > > fs/nfs/pnfs.c | 7 +++++++ > > fs/nfs/pnfs.h | 2 ++ > > 3 files changed, 10 insertions(+) > > > > diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelay= out.c > > index 4974cd18ca46..13df85457cf5 100644 > > --- a/fs/nfs/filelayout/filelayout.c > > +++ b/fs/nfs/filelayout/filelayout.c > > @@ -862,6 +862,7 @@ fl_pnfs_update_layout(struct inode *ino, > > > > status =3D filelayout_check_deviceid(lo, fl, gfp_flags); > > if (status) { > > + pnfs_mark_layout_unavailable(lo, iomode); > > pnfs_put_lseg(lseg); > > lseg =3D NULL; > > } > > diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c > > index a5db5158c634..bac15dcf99bb 100644 > > --- a/fs/nfs/pnfs.c > > +++ b/fs/nfs/pnfs.c > > @@ -491,6 +491,13 @@ pnfs_layout_set_fail_bit(struct pnfs_layout_hdr *l= o, int fail_bit) > > refcount_inc(&lo->plh_refcount); > > } > > > > +void > > +pnfs_mark_layout_unavailable(struct pnfs_layout_hdr *lo, enum pnfs_iom= ode fail_bit) > > +{ > > + pnfs_layout_set_fail_bit(lo, pnfs_iomode_to_fail_bit(fail_bit)); > > I suggest rather using pnfs_layout_io_set_failed() so that we also evict = the layout segment that references this unrecognised deviceid. In fact, the= re is already an exported function pnfs_set_lo_fail() (which could definite= ly do with a better name!) that does this. I'm not opposed to this approach. In the proposed patch, I treated it as the layout being still valid but unavailable. My question is: I think we need to return the layout before doing this, correct? Should I be making changes to export something like pnfs_set_plh_return_info() or would adding a new function to pnfs.c that does pnfs_set_lo_fail and returns the layout? something like +void pnfs_invalidate_return_layout(struct pnfs_layout_segment *lseg) +{ + pnfs_layout_io_set_failed(lseg->pls_layout, lseg->pls_range.iomode)= ; + pnfs_set_plh_return_info(lseg->pls_layout, lseg->pls_range.iomode, = 0); +} +EXPORT_SYMBOL_GPL(pnfs_invalidate_return_layout); status =3D filelayout_check_deviceid(lo, fl, gfp_flags); if (status) { + pnfs_invalidate_return_layout(lseg); pnfs_put_lseg(lseg); lseg =3D NULL; > > > +} > > +EXPORT_SYMBOL_GPL(pnfs_mark_layout_unavailable); > > + > > static void > > pnfs_layout_clear_fail_bit(struct pnfs_layout_hdr *lo, int fail_bit) > > { > > diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h > > index e3e6a41f19de..9f47bd883fc3 100644 > > --- a/fs/nfs/pnfs.h > > +++ b/fs/nfs/pnfs.h > > @@ -343,6 +343,8 @@ void pnfs_error_mark_layout_for_return(struct inode= *inode, > > void pnfs_layout_return_unused_byclid(struct nfs_client *clp, > > enum pnfs_iomode iomode); > > > > +void pnfs_mark_layout_unavailable(struct pnfs_layout_hdr *lo, > > + enum pnfs_iomode iomode); > > /* nfs4_deviceid_flags */ > > enum { > > NFS_DEVICEID_INVALID =3D 0, /* set when MDS clientid recalled */ > > -- > > 2.31.1 > > > > _________________________________ > Trond Myklebust > Linux NFS client maintainer, Hammerspace > trond.myklebust@hammerspace.com >