From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793818401; b=vIRTaRo8rGhCMV45Xu/JW9JN6WcdeM6mR1aZFtaHugDdg/57sGhoSDkwMDIETOYbElKk Yjwzy4YRoWKLIBYbHAdfkef26/R8JqG6QU5ocoBipKlGZR6i+zHvEaJViLtonFekBduov gzBrOsm4QHNCOmtoWMeDV1ofIfEAF8+2DF6ku0zeEWJc1q8QfJ9hdWm8jr5klFJgAKlys PTgeaJlaglhdhwey97uIS5phjn8Gw15lJN0gIF56WO91TqIzvin/Oy5xhGzvO1bFyu5U+ mWM4B1gnjBpPJ+sRJATzgogbotpXLLcK0H9PwM1iHYEZZ3EcXP//+tzMAx+fPVjGbpg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793818401; h=Received:DKIM-Signature:Subject:To:Cc:From:Date:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=wuDnu4gN8KUmi1hwpazgc4sYgqJrz5kZOH5bTQemWIc=; b=zBx2eXvHry3VdX9t9Ulhzm6yRI6Wv73o3F0od7cXwr1fjlsFvxzMKG1ntV/5p/E3knRC IRSe9B09+Py9HQWHPIJMzwbXIwZyi/h4chE2O/iV/UG9gDRuw/ynlxTrDx0JBdu+vlzKT cG1i9dNoBQF4gJWPyy1xGhkYdHb4Dr+kIfImIZ2h8HzljFvCHlwKHcHeb4oEJpz6Y0uKg JmwCe2atU6FTR1oKN90g1www251P11/xoJ2wMrpV/cF1fpqnJwt95Lg+sMx/dDizDpXhS EVo22ymQul/L26p8UZVDL5rs9bi9lgq8PM5ic6YLN42yc8tIQjNmzhfZzOgRVBgHvJQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=kilWqXMl; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61C61606A32D for ; Wed, 4 Nov 2026 18:53:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=kilWqXMl Received: by smtp.kernel.org (Postfix) with ESMTPSA id B42671F00919; Wed, 4 Nov 2026 18:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793818401; bh=wuDnu4gN8KUmi1hwpazgc4sYgqJrz5kZOH5bTQemWIc=; h=Subject:To:Cc:From:Date; b=kilWqXMlAF46NbALO6ejeD39HN7MluXus/xuaSBx3J4q+hN+cP4pXerq1ealj9tMx NoUYiENfkg489Ybn62t1pK6QpVyym//f6QoVcmbPLJQ7cNE7l+Lb2KZp3YVIOdjbUh K80oJznVT8vOAbnxreCBZdki86v56KhOYASd6qq0= Subject: FAILED: patch "[PATCH] NFSD: Send a meaningful CB_RECALL_ANY keep count" failed to apply to 6.1-stable tree To: cel@kernel.org,jlayton@kernel.org Cc: From: Date: Wed, 04 Nov 2026 13:53:18 -0500 Message-ID: <2026110418-copilot-agent-90d4@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 9af39c0773ef956039e1ebe9c235532fe6ee1e50 # git commit -s git send-email --to '' --in-reply-to '2026110418-copilot-agent-90d4@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9af39c0773ef956039e1ebe9c235532fe6ee1e50 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Mon, 17 Aug 2026 21:08:39 -0400 Subject: [PATCH] NFSD: Send a meaningful CB_RECALL_ANY keep count deleg_reaper() sets craa_objects_to_keep to zero on every CB_RECALL_ANY. RFC 8881 Section 20.6.3 defines that field as the number of objects the client may keep, leaving the client to choose which of the excess to return, because the server cannot read lack of recent use as lack of usefulness. Zero asks for every delegation the client holds, including the ones backing files an application still has open. There is also no reason NFSD has to reclaim the entire delegation working set on the first sign of memory pressure. Derive the keep count from cl_deleg_count so that each callback asks for one delegation. Both the shrinker and the laundromat re-arm while their condition lasts, so a client with more to give is asked again on the next pass. The Linux client ignores craa_objects_to_keep and returns unused delegations selected from the type mask alone, so the count changes nothing for it. Fixes: 44df6f439a17 ("NFSD: add delegation reaper to react to low memory condition") Cc: stable@vger.kernel.org Reviewed-by: Jeff Layton Link: https://patch.msgid.link/20260817-recall-any-keep-count-v5-4-3b2cffce701e@kernel.org Signed-off-by: Chuck Lever diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f6da74ce16a9..9d40b573a295 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -7959,6 +7959,7 @@ deleg_reaper(struct nfsd_net *nn) { struct list_head *pos, *next; struct nfs4_client *clp; + unsigned int count; spin_lock(&nn->client_lock); list_for_each_safe(pos, next, &nn->client_lru) { @@ -7968,21 +7969,33 @@ deleg_reaper(struct nfsd_net *nn) continue; if (clp->cl_state != NFSD4_ACTIVE) continue; - if (list_empty(&clp->cl_delegations)) - continue; if (atomic_read(&clp->cl_delegs_in_recall)) continue; if (ktime_get_boottime_seconds() - clp->cl_ra_time < 5) continue; if (clp->cl_cb_state != NFSD4_CB_UP) continue; + /* + * This read races with hash_delegation_locked() and + * unhash_delegation_locked() on other CPUs. A stale + * count only skews the keep value; the next + * laundromat pass sees a more current one. + */ + count = data_race(READ_ONCE(clp->cl_deleg_count)); + if (!count) + continue; if (test_and_set_bit(NFSD4_CALLBACK_RUNNING, &clp->cl_ra->ra_cb.cb_flags)) continue; /* release in nfsd4_cb_recall_any_release */ kref_get(&clp->cl_nfsdfs.cl_ref); clp->cl_ra_time = ktime_get_boottime_seconds(); - clp->cl_ra->ra_keep = 0; + /* + * Ask for a single delegation. Recalling one before it + * is needed costs the client an OPEN when it next + * touches the file. + */ + clp->cl_ra->ra_keep = count - 1; clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) | BIT(RCA4_TYPE_MASK_WDATA_DLG) | BIT(RCA4_TYPE_MASK_DIR_DLG);