From nobody Mon Apr 6 10:30:40 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 394323B2FEE for ; Mon, 30 Mar 2026 08:43:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774860207; cv=none; b=qMAA1Q+Wt8K7hPGP+tL/UpkzLP7PV/TWfpmq6gjmu+Xz0/bQPpKGMJzi3bWg0frRCRlbL+CpEbzScs08cfVv24tcIl/XdH+9ubN1hC+DFjaU6cmT07WsALat/3/iqzsbHZaX9ksWvtfLYmvsMdUjVgZZDHbr/xooRe6UdsUbuf8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774860207; c=relaxed/simple; bh=OOlsXudGqSHm3OwpfUdoZuF/A53N2s9ZFH3DhrVT9dc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=G70RdD+UD9re+Iax0NP/Z9QNQv5RzmYUx+nDqOFfFDCdCYmRatwuOMJRUzgim+cQEynNgYpke33veDZvM9go6pc7aLdzCi0Y9Py8FkOslrED6l44yu1BlSlEzvqpK6qas0nTI9nONswcU4tdETus7XHAJ20QNwkp9QB5xzZuhA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=OvzU3+g3; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="OvzU3+g3" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-43cf5d14d6eso1171801f8f.0 for ; Mon, 30 Mar 2026 01:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1774860204; x=1775465004; 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=UO0v74qmrXUTYDdElM5PYynacz0f0jvqBa24URvpyVw=; b=OvzU3+g37ya56YRTZeK0SalEi9+WonPkmrJ8SlWm7pdjQqQx9Lz6uH7xjBqCMynKIl Xs8ieW3eD0Wltmv2W60akIj6zZo5CwrXWVha1YFth8GzrwjkNy13l3a7/w+2aJQiYgVt oVi3BE1sRbpUkJ98jKZ+UGyMm8rwrF+s3RgjU+8qgsKartZRA+bnHdzDG3lXEq6a3SBc tLfAZu8a3OTC8AS81dyigAChn99uIcbSu3bQsjaD8pcvv5SqPsje3/lHDCBsM1Sbc5iM ifBd1OVQlJkTLejLedwzvmO1qyRXzcGABoQyopjTIg3IYLoKBmFLPqp9huxdXVk7yiJP nJnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774860204; x=1775465004; 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=UO0v74qmrXUTYDdElM5PYynacz0f0jvqBa24URvpyVw=; b=gFJh+E78TAeGWLabWwst0SX5WHTPNCWZPcWTKrcwBZXhiNxMGMcqeMXMMCO3/WosSL M0NJcg28Uwy+4SqzaAcjBqB9mNI5+xNIMT16uTjC2dCGVgh3IlEXiNM6SbvooN8FGE6k I+S7YelKinUAbhFk4fM8J8Jh5qM8D6AVltL7gtzsT8wIw50Q2X6tQh93GO9+sNrii9+E LOvbC/F8afOZy2/QTk/CKl7NPCJ+2k0zz4n44YvZJDDuGy2Ek8VUGbh+dl1ckFiJVvb/ 59FQnp2e7czaYi0qhUW3f//cNNoJiAdy+hNg0H6PkEqd4iOWslDr8nPToubPkjIawUDV jBdw== X-Forwarded-Encrypted: i=1; AJvYcCW8ZuvNXCwTpr0gyHjm9s5EVwjZ6pLDN8w0h4+58zUl2+Mr577D/LeL81tUPhP+Ri8liTBHlzfLjFYDnFE=@vger.kernel.org X-Gm-Message-State: AOJu0YxKY49j8Sz66YJRH1aReaYIijTo8TX+nMS10uK/xoLQWaJlHDDK 8Ry114nhAncWbcAMhIBPe8NY5t/kb3dfYkbratMagqs2qYsULyfiXkAROY2YKpl1L+w= X-Gm-Gg: ATEYQzxBAyLJugpaqqud37ddCEI7V41uOdpEKfimB9iaaMBi3qnAf4udXdIA7lGTNUD dLlJ6luVZY9xHCGTJBty2r6Ksy8+YUG6mxuhGUFKoTxYfn0doaqnLdDi4gxe1qzKAvCap4PtUhY 9F4ddgpVWtLI/6VooB5Pxzcil1XSaEdy0m9oiDe8c2IRUZUmSDfRfwxqEq20V/MPIz9ysNhMhCm LGclvzI04rnKZkU0SrwOiL7fqwm8QO3kiteMTEorYNfog9l8QUCRrXtBu+RvIRAzkQgfDNqCnbj jSX35rDAcTDWVZe3F0Znx268iCVeFSeTF5bkh4PifD7Gpx07MnvxkXbnP9+Qman8S1HpZYbnhO2 /cMoCSS5nIxHF99mg8fAjY5z1IshCfiwqTtMrsTP+DYYwnxe+hxCc2d7NxRRQC5OpBRqiJOOFs9 OwQiDS/3LnjRA74jbFL7QjjKF9rN7tWiHbBjazyuvvSQMVswIUDf+cHhsXlMAI3PvAeWIX8Ckup a0OlNYnpoQMjFnYs6eUCy2VFB5QK7ZkT1lsqw== X-Received: by 2002:a05:6000:2003:b0:43b:45d1:f438 with SMTP id ffacd0b85a97d-43b9e9da653mr19145390f8f.3.1774860203620; Mon, 30 Mar 2026 01:43:23 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f2b4400023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f2b:4400:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43cf21e2a7asm19130650f8f.7.2026.03.30.01.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2026 01:43:23 -0700 (PDT) From: Max Kellermann To: idryomov@gmail.com, amarkuze@redhat.com, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH] ceph: clear `s_cap_reconnect` when ceph_pagelist_encode_32() fails Date: Mon, 30 Mar 2026 10:43:19 +0200 Message-ID: <20260330084319.1357751-1-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.3 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" This MDS reconnect error path leaves s_cap_reconnect set. send_mds_reconnect() sets the bit at the beginning of the reconnect, but the first failing operation after that, ceph_pagelist_encode_32(), can jump to `fail:` without clearing it. __ceph_remove_cap() consults that flag to decide whether cap releases should be queued. A reconnect-preparation failure therefore leaves the session in reconnect mode from the cap-release path's point of view and can strand release work until some later state transition repairs it. Signed-off-by: Max Kellermann Reviewed-by: Viacheslav Dubeyko Tested-by: Viacheslav Dubeyko --- fs/ceph/mds_client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index b1746273f186..4fa471d9b3b2 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -4956,7 +4956,7 @@ static void send_mds_reconnect(struct ceph_mds_client= *mdsc, /* placeholder for nr_caps */ err =3D ceph_pagelist_encode_32(recon_state.pagelist, 0); if (err) - goto fail; + goto fail_clear_cap_reconnect; =20 if (test_bit(CEPHFS_FEATURE_MULTI_RECONNECT, &session->s_features)) { recon_state.msg_version =3D 3; @@ -5046,6 +5046,10 @@ static void send_mds_reconnect(struct ceph_mds_clien= t *mdsc, ceph_pagelist_release(recon_state.pagelist); return; =20 +fail_clear_cap_reconnect: + spin_lock(&session->s_cap_lock); + session->s_cap_reconnect =3D 0; + spin_unlock(&session->s_cap_lock); fail: ceph_msg_put(reply); up_read(&mdsc->snap_rwsem); --=20 2.47.3