From nobody Sat Feb 7 22:56:25 2026 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5AE4C1E8342 for ; Tue, 9 Dec 2025 14:53:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765292030; cv=none; b=bLE3LZcBgYGBuuYPK3R31/EsEb7QV+LW7dl8pCHuc7dFKmYq/CrLOAlhfzAPXOIy7MMq0QTjxNmCyIibAZZP27VsOGx7FWyjFWJ3Bg/FlW7P9GhGeP/mTji32TBKYs/b0ScUAh9Is8J4WFRUoyy4zgX2fPiW6pzz3ioso6FaEzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765292030; c=relaxed/simple; bh=uFGT0ZEj2AbeXqKs6lrV70ytSZm59Gcxf7iBVJ+4WX4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rZzd/Ssj4jkvmgOGgoM2/UeezzFSmqg8bHbOLEXBRb8auHbbbU44xW0ZCQvBpGzCAzTCHyf5h3MkNXPk0r0huixtgvX/l3bBrevpmT7w6DJ5FrD2q8qittv3rPK92YMuILSEzkE+snOumWmgVFC3TTKYvos3w9wPpQSCGlEHZIM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fVQyKobD; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fVQyKobD" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-47798f4059fso7405925e9.2 for ; Tue, 09 Dec 2025 06:53:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765292027; x=1765896827; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=XUh5sg5yqFLSqapLy+vXru3lVWHscnLIsYFdEarvyS0=; b=fVQyKobD8CtsfVvpoMvQs79Vm6Pa0GqlXMIsGA+ogKpcMqvLYC4TDM7sUEnyDDABfx ZAEF3T9IbpxybylTwUHviCHiFcTOYXwoa4W/5sihEMcocsb2MDatisYb26XQ8G8geRCz ypKyitD0y9Keub2QmgCvVR0UF4r63KANkFotw0ezKQXUFQgKo/+dilojh8w4Uo3z+JTV rtfqLwC9WsYLjvHfyJezNrjqj6FUHTo3NtJAHHEgkmItgFByWMciICSnwjWjg2h1DKmZ SivvPWoLQHP0w5fEhc3YksAmT1NZrcCV67/ypb0VH5GpCv8pgkkvzShzsfw+A/BhEtmD VDJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765292027; x=1765896827; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XUh5sg5yqFLSqapLy+vXru3lVWHscnLIsYFdEarvyS0=; b=taM8Swl5LXNBBdv6ZN/RL1VasE0f+0g8aOpgtDA6/u/6jz+6UGnjbQwue6JcTTdM6g NygE8W8P+Tmj5EQK5LauU37rhujnAqVP/4C/jabDdzRq32hLvDQ4z3Lpspcf5unIFeoJ Wqi5xlE4qMUzJbKfs9NwDiFGzdv5SKu8xcuVvmGJXFo2JZSzeJgBtKFXdJIHHnvNmJo5 aqYqPGpTJ1ChxNZJ3pCwFE3zJ5wLpqja4QZJMAbR4aTG00+SxBHKZhlacfvH+perwcIv Z5H3YbVi9wR/3ax0One5NfuPpbFqsNftqG7dfsAZq/KNJJfOk2AKEZWUH3Rx7RlRRLS0 8CAg== X-Forwarded-Encrypted: i=1; AJvYcCUEiwnRX6gNfpIcOCeuoQw1Ji0HgwsRaSb+ojritiUrUa+9cE4NIqh2xBLFPZcJ2ahnAtzlmV74C/H+uUI=@vger.kernel.org X-Gm-Message-State: AOJu0YxjD2arWlE3hVf0HeZFt/IW44MHumvTgCv2tMYfgqht/fhmyoF5 6oXb/iK9XOZ8Tf0Ichjt5J7YaHeitgIAZQvDv1KucOI3QZ5bmIV1Cg0TkpVVrxLCuCOeBQ== X-Gm-Gg: ASbGnct5zNW1jRUn9X9k61nCkk8OyBG4ce/MoMKoDzH25N/x8UIwJOGcyOqeXHno8We NAoY7DddZhiA5xqzf9u5jkAVHenYIFt9LA/NAEbrk2sJzQjqwvgzj5M5DiqHiZ1XOzFC1WpBfAm 9oWT0HGXyA8fMyQJ5GlVmhPlHv1rE8dGslpId5hGFhhM5ncQgfCPbTxTmTmy73FyEHi8bdx8v22 awf8yoM3WDeB9ZZFAfQuxhOD0zcw1BOd3oBHduBZ/UnHYktD61dVpiCXCj/hIHoL0LziN1HHoH3 MfWZIJPvzwebQym+Y48YOpc+dXUStofZMZBNWvgale3RK/SXrIAUDug0dLu2nqjwyeE9kaZbKaX ffCRcAHeAsQNd5Hfh9Tyq9uQUsjHWWP1Ld4Ml7o7fx28b0O9MMEpRBHfhitstxX+Ph7uOjHhsvD q6jkFNaJBMrDXEPg0yqKxq6wOgiDIcJqMwTEpyp0oqu36X7xClmoIAqSKl4qICtHMDugsSVN/Iw +3uA+PNZI21ey9mXoDeWJHWq20= X-Google-Smtp-Source: AGHT+IHabqNeZqOUTcq+z8LIxjUsvRnmjcY/N9ehDS8dYrqi79lPjDJzf39zxVgHptPGsmn2IqraJA== X-Received: by 2002:a05:600c:46c9:b0:477:a450:7aa2 with SMTP id 5b1f17b1804b1-47939deffb2mr74716815e9.1.1765292026551; Tue, 09 Dec 2025 06:53:46 -0800 (PST) Received: from Mac.localdomain.com (walt-26-b2-v4wan-170690-cust332.vm13.cable.virginm.net. [82.19.157.77]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42f7cbff320sm32173433f8f.18.2025.12.09.06.53.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 09 Dec 2025 06:53:46 -0800 (PST) From: Robert Milkowski To: trondmy@kernel.org Cc: anna@kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Milkowski Subject: [PATCH] nfs: pnfs: handle early layoutreturn failures gracefully Date: Tue, 9 Dec 2025 14:53:30 +0000 Message-ID: <20251209145330.28053-1-rmilkowski@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" pnfs_layoutreturn_before_put_layout_hdr() bumps the layout header refcount and sets NFS_LAYOUT_RETURN before prepare or rpc_run_task dispatch. If the layout driver fails prepare or rpc_run_task() fails to queue the call, we currently leak refs and leave waiters stuck on pnfs_prepare_to_retry_layoutget(). Mirror the normal completion path for these early failures: warn and schedule pnfs_layoutreturn_retry_later(), free any reserved slot, drop refs/creds/inode, and clear the wait bit. Signed-off-by: Robert Milkowski --- fs/nfs/nfs4proc.c | 37 +++++++++++++++++++++++++------------ fs/nfs/pnfs.c | 21 +++++++++++++++++++-- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 93c6ce04332b..6066a1c7227d 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -10132,25 +10132,34 @@ static void nfs4_layoutreturn_done(struct rpc_tas= k *task, void *calldata) rpc_restart_call_prepare(task); } =20 -static void nfs4_layoutreturn_release(void *calldata) +static void nfs4_layoutreturn_cleanup(struct nfs4_layoutreturn *lrp, int s= tatus) { - struct nfs4_layoutreturn *lrp =3D calldata; struct pnfs_layout_hdr *lo =3D lrp->args.layout; =20 - if (lrp->rpc_status =3D=3D 0 || !lrp->inode) - pnfs_layoutreturn_free_lsegs( - lo, &lrp->args.stateid, &lrp->args.range, - lrp->res.lrs_present ? &lrp->res.stateid : NULL); + if (status =3D=3D 0 || !lrp->inode) + pnfs_layoutreturn_free_lsegs(lo, &lrp->args.stateid, + &lrp->args.range, + lrp->res.lrs_present ? + &lrp->res.stateid : NULL); else pnfs_layoutreturn_retry_later(lo, &lrp->args.stateid, &lrp->args.range); - nfs4_sequence_free_slot(&lrp->res.seq_res); + if (lrp->res.seq_res.sr_slot) + nfs4_sequence_free_slot(&lrp->res.seq_res); if (lrp->ld_private.ops && lrp->ld_private.ops->free) lrp->ld_private.ops->free(&lrp->ld_private); - pnfs_put_layout_hdr(lrp->args.layout); - nfs_iput_and_deactive(lrp->inode); + pnfs_put_layout_hdr(lo); + if (lrp->inode) + nfs_iput_and_deactive(lrp->inode); put_cred(lrp->cred); - kfree(calldata); + kfree(lrp); +} + +static void nfs4_layoutreturn_release(void *calldata) +{ + struct nfs4_layoutreturn *lrp =3D calldata; + + nfs4_layoutreturn_cleanup(lrp, lrp->rpc_status); } =20 static const struct rpc_call_ops nfs4_layoutreturn_call_ops =3D { @@ -10198,8 +10207,12 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutretur= n *lrp, unsigned int flags) nfs4_init_sequence(&lrp->args.seq_args, &lrp->res.seq_res, 1, 0); task =3D rpc_run_task(&task_setup_data); - if (IS_ERR(task)) - return PTR_ERR(task); + if (IS_ERR(task)) { + status =3D PTR_ERR(task); + trace_nfs4_layoutreturn(lrp->args.inode, &lrp->args.stateid, status); + nfs4_layoutreturn_cleanup(lrp, status); + return status; + } if (!(flags & PNFS_FL_LAYOUTRETURN_ASYNC)) status =3D task->tk_status; trace_nfs4_layoutreturn(lrp->args.inode, &lrp->args.stateid, status); diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index f157d43d1312..a489f43344b8 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1370,13 +1370,30 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, lrp->args.ld_private =3D &lrp->ld_private; lrp->clp =3D NFS_SERVER(ino)->nfs_client; lrp->cred =3D cred; - if (ld->prepare_layoutreturn) - ld->prepare_layoutreturn(&lrp->args); + if (ld->prepare_layoutreturn) { + status =3D ld->prepare_layoutreturn(&lrp->args); + if (status) { + pr_warn_ratelimited("NFS: pNFS layoutreturn prepare failed (%d) for lay= out driver %s\n", + status, ld->name ? ld->name : "unknown"); + goto out_prepare_fail; + } + } =20 status =3D nfs4_proc_layoutreturn(lrp, flags); out: dprintk("<-- %s status: %d\n", __func__, status); return status; + +out_prepare_fail: + pnfs_layoutreturn_retry_later(lo, &lrp->args.stateid, &lrp->args.range); + if (lrp->ld_private.ops && lrp->ld_private.ops->free) + lrp->ld_private.ops->free(&lrp->ld_private); + if (lrp->inode) + nfs_iput_and_deactive(lrp->inode); + put_cred(cred); + kfree(lrp); + pnfs_put_layout_hdr(lo); + return status; } =20 /* Return true if layoutreturn is needed */ base-commit: cb015814f8b6eebcbb8e46e111d108892c5e6821 --=20 2.47.1