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 4D07846F49A; Tue, 21 Jul 2026 20:26:13 +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=1784665575; cv=none; b=JqAA1D6Gv46BMiiV6tx/WLCNTEQdz6Ieg1AUmTYrJL73ktaD0ZE06vQHxL/W6tKc0scAcsce0LEbunD2+FVpQnNtK7177w7lno9es0UnbiTOuf/GiwGWpRMp6UYW1mGtx3IUX7oXSrZz9PxWEgmvw55ImmtHNqXWlRr3X1XNLHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784665575; c=relaxed/simple; bh=mrOqq3ThLH7TdLFbxckFquIzUOg6A8HDiP0kSheZxZ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pM82ZsHeKNAmw9gYJ2Rb3FMUTTACURLr1sUbHD0HkYJUXZ5XnJa1fYb+PdYwQLrMcFQp5ktyHOu4TMPAH9RgrtNVHHocEWFpqXtumoAT5DfvnjnTXFWReb7mO7IegVImHG8yJGfvc5x7+g260IKRakNk/JurU4NHxEawy6wEkEc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=flH2H1GI; 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="flH2H1GI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91B3E1F000E9; Tue, 21 Jul 2026 20:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784665573; bh=jvUK5f0hBJArBUQMyerLyJjnQqM6dMT3cdBzyzPeqmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=flH2H1GIUHNCK5Ky6QVyddcMBK0Qkc39U7R698Th6vr4S97DgMCsPwqCpUC5WnOov 7K8W6VRhHt7RyxFKuRSkfFg3nwdfiG/tzqimRrt+gh5WQvpAEJBRq7a/htUpyekyWs +kA1sD/qeDSWz+0Xldvi5dsEAT0GyB8IsmsXsfIw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Simon Horman , David Howells , Li Daming , Ren Wei , Marc Dionne , Jeffrey Altman , linux-afs@lists.infradead.org, stable@kernel.org, Jakub Kicinski Subject: [PATCH 6.6 0354/1266] afs: Fix netns teardown to cancel the preallocation charger Date: Tue, 21 Jul 2026 17:13:11 +0200 Message-ID: <20260721152449.752812690@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152441.786066624@linuxfoundation.org> References: <20260721152441.786066624@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells commit 47694fbc9d24ab6bf210f91e8efe06a10a478064 upstream. Fix the teardown of an afs network namespace to make sure it cancels the work item that keeps the preallocated rxrpc call/conn/peer queue charged before incoming calls are disabled (i.e. listen 0). Also, if net->live is false because the afs netns is being deleted, make afs_charge_preallocation() skip charging and make afs_rx_new_call() avoid requeuing the charger. (This was found by AI review). Fixes: 00e907127e6f ("rxrpc: Preallocate peers, conns and calls for incoming service requests") Reported-by: Simon Horman Signed-off-by: David Howells cc: Li Daming cc: Ren Wei cc: Marc Dionne cc: Jeffrey Altman cc: linux-afs@lists.infradead.org cc: stable@kernel.org Link: https://patch.msgid.link/20260609140911.838677-5-dhowells@redhat.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- fs/afs/rxrpc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -109,6 +109,7 @@ void afs_close_socket(struct afs_net *ne { _enter(""); + cancel_work_sync(&net->charge_preallocation_work); kernel_listen(net->socket, 0); flush_workqueue(afs_async_calls); @@ -727,7 +728,7 @@ void afs_charge_preallocation(struct wor container_of(work, struct afs_net, charge_preallocation_work); struct afs_call *call = net->spare_incoming_call; - for (;;) { + while (READ_ONCE(net->live)) { if (!call) { call = afs_alloc_call(net, &afs_RXCMxxxx, GFP_KERNEL); if (!call) @@ -772,7 +773,8 @@ static void afs_rx_new_call(struct sock { struct afs_net *net = afs_sock2net(sk); - queue_work(afs_wq, &net->charge_preallocation_work); + if (net->live) + queue_work(afs_wq, &net->charge_preallocation_work); } /*