From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87CE7332907; Fri, 17 Oct 2025 15:03:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760713426; cv=none; b=uB8sqjPG/h4exdn5376hThXSTaZXsp3HFv5foYpPdLgRpQoVXEX7FfCXbJsJeyM3pUESubBSsjdoDQVjI3uWZ9XmKxh4+7g/geuq9JLrrAsDz4xBWd2Pjy49itoU28hVy8ClWB3DDAaBthtGM7gRk54qaSSmi2iz0OJENX88bAM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760713426; c=relaxed/simple; bh=fzRcVn2dSNjAMrJQaP1P3AaKfeUc0eUD0ruKf+G3Imo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=czmh6+XTrSYQCyvAuqgcUnxVv0zLE1emMHfp8hyzYzDByJxZg3dbeiylWe8OjWRGehJsOp13bgdd1AWZTV0G4NjS5FXvLsJTDPzSLuocQIcW+jOTG6pBy1tfxY0nFU3i2FJZUkt1CPyl4utV7pnYb+vZe8E3NKBZg3x5ZugfjnA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AMdDjB+f; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AMdDjB+f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE17EC4CEE7; Fri, 17 Oct 2025 15:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760713426; bh=fzRcVn2dSNjAMrJQaP1P3AaKfeUc0eUD0ruKf+G3Imo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AMdDjB+fmORRPnYXfsB7ZXO7qYnhQyQofzKaFfeAzQUYA9jTcVJR8TcjUHV1VzSdp sY/RSphdbLpn5oU/gQUPU/ARE/n79Pz7/1F0sP2kMFgvnEUuCmYufGzz8MnbJi4mIg Dg/XiS9cwnNx0WrRhIkiYerglV/8vByX5Zx1C91Y= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Olga Kornievskaia , Chuck Lever Subject: [PATCH 6.1 128/168] nfsd: nfserr_jukebox in nlm_fopen should lead to a retry Date: Fri, 17 Oct 2025 16:53:27 +0200 Message-ID: <20251017145133.739951523@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017145129.000176255@linuxfoundation.org> References: <20251017145129.000176255@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Olga Kornievskaia commit a082e4b4d08a4a0e656d90c2c05da85f23e6d0c9 upstream. When v3 NLM request finds a conflicting delegation, it triggers a delegation recall and nfsd_open fails with EAGAIN. nfsd_open then translates EAGAIN into nfserr_jukebox. In nlm_fopen, instead of returning nlm_failed for when there is a conflicting delegation, drop this NLM request so that the client retries. Once delegation is recalled and if a local lock is claimed, a retry would lead to nfsd returning a nlm_lck_blocked error or a successful nlm lock. Fixes: d343fce148a4 ("[PATCH] knfsd: Allow lockd to drop replies as appropriate") Cc: stable@vger.kernel.org # v6.6 Signed-off-by: Olga Kornievskaia Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/lockd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) --- a/fs/nfsd/lockd.c +++ b/fs/nfsd/lockd.c @@ -48,6 +48,21 @@ nlm_fopen(struct svc_rqst *rqstp, struct switch (nfserr) { case nfs_ok: return 0; + case nfserr_jukebox: + /* this error can indicate a presence of a conflicting + * delegation to an NLM lock request. Options are: + * (1) For now, drop this request and make the client + * retry. When delegation is returned, client's lock retry + * will complete. + * (2) NLM4_DENIED as per "spec" signals to the client + * that the lock is unavailable now but client can retry. + * Linux client implementation does not. It treats + * NLM4_DENIED same as NLM4_FAILED and errors the request. + * (3) For the future, treat this as blocked lock and try + * to callback when the delegation is returned but might + * not have a proper lock request to block on. + */ + fallthrough; case nfserr_dropit: return nlm_drop_reply; case nfserr_stale: