From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 24F62372B4B; Fri, 4 Sep 2026 05:42:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500579; cv=none; b=UXrebhKVlmn3eBt2/GZ5l2wlL5OfOl2E1MSkYoEjtn6NTYHHO29h4nhu3xma7aAz3E8LbY2F83V9rjcBT4KMTtxw2baVeg+WyaUYnnBJVR6eOh5URGEWUluxRr9D0pC+M6o1gfyz1maTxwMYyCh6vNi5NyX+BWQo70Npsu2oKD4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500579; c=relaxed/simple; bh=339eoocxCvoudsbsV0BYKCirjMuRklzU4QJBfuo5cV8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tXRGBIwJKOSPUdTPMGkd9NLUB343eo2QWEqek6JBC3XeFYbd1aX8TMwfOmoOKyCBM0nddiJLHjsEbmR1M+SiR8P3SaRXqBvrmUFoXEfoRNd76Uf5CupPUyvlHef0txffVhqtZusIGtnn//Nf5pL17aAaDUMCfACwD8x1+OLJOWk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oHNQqYKp; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="oHNQqYKp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 800921F00A3D; Fri, 4 Sep 2026 05:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788500578; bh=G5hcmIpVdkMq7a3xHi9AdTYkTNaJhWNhiMURj+zbIV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oHNQqYKpJ5efQEAeD8s8Lf3dnuWj9Nn0kaJ+pFCh8BDUjxTYBx1oxtn9FfJOuYghc 7wBboUCsybipFlQx3iVW1YILSNPzaje4ypxDGg+uk0G86rkb/cLJt8ws9DpJWbONCy oQWSZziBFENHiaNPTp3noUC6DrGnf6Oln6S7U+ts= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuhao Jiang , Junrui Luo , Trond Myklebust Subject: [PATCH 6.18 105/552] NFSv4.1: fix layout segment leak on the pnfs_layout_process() forget path Date: Fri, 4 Sep 2026 06:54:22 +0200 Message-ID: <20260904045750.285033818@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045747.813364717@linuxfoundation.org> References: <20260904045747.813364717@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Junrui Luo commit ee5a386cfe60f3f8286de16a9db8e1a08f0bc124 upstream. When the server returns a new layout stateid while a valid one is still held, pnfs_layout_process() calls pnfs_mark_matching_lsegs_return() on the on-stack free_me list and jumps to out_forget. Segments whose reference count drops to zero are unlinked from lo->plh_segs and moved to free_me by mark_lseg_invalid(); for an idle cached segment the layout header holds the only reference, so this happens on the first decrement. out_forget never drains free_me -- only the success path calls pnfs_free_lseg_list(). Commit 814b84971388 ("pNFS/NFSv4: Fix a layout segment leak in pnfs_layout_process()") added the drain; commit 08bd8dbe8882 ("pNFS/NFSv4: Try to return invalid layout in pnfs_layout_process()") removed it while switching the destination to lo->plh_return_segs, which is drained elsewhere. Commit fb700ef02676 ("NFSv4.1: Simplify layout return in pnfs_layout_process()") switched the destination back to free_me without restoring the drain. Restore the pnfs_free_lseg_list() call. Fixes: fb700ef02676 ("NFSv4.1: Simplify layout return in pnfs_layout_process()") Reported-by: Yuhao Jiang Assisted-by: Claude:claude-opus-5 Cc: stable@vger.kernel.org Signed-off-by: Junrui Luo Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/pnfs.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -2631,6 +2631,7 @@ out_forget: spin_unlock(&ino->i_lock); lseg->pls_layout = lo; NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg); + pnfs_free_lseg_list(&free_me); return ERR_PTR(-EAGAIN); }