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=1793831801; b=kNpNUSo588bcHzK/TPve74lVBi/Ah+OL7mkHzjMJACgXXLDhIjTGaFgWHX8apuydBTGc 0Nl1ohFraklsplSQaXNQCWmDUdCnJ4QoWjjfT8mUKqJWZH0lbQYGjlmHihfAtF1B6oPs0 TFWAgjoLN2w4cExM/al0uCm+2eVMFzmqrQr+FWuV1HMRDrXRaEwoGBzvas6hJR/c+t29T elRYh1Ug0hWJx3TQ42jMOidd6O2XD7ATzaHztznFLasWJQRrNnfUmpDLaVlZXlLkjGKfO pSqxtMVReo7VTvQQPCD/hOcjxMi+SVv+BO1Qc+JiETjTryv4u7NR2F3F7MCQZ7/h9Xg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793831801; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=lGRevT01WQjFYbjZasnHtR/aBCf4yGamCHvzRa4NQZM=; b=bjCx+4gxmZcbf/7L6lwlZJ9OYHxnWIJLvOuGS8/UxCkSRxjKAal4e2qEwGnIdjcFLt15 QRIJVVHjXNikqPBtvYFEu6+ZxOYg8C6sC0DRPWjFuNjZj+d4Usk4gY9fLEdgoOeAiODFl 0UbuAF1bMscNMByenxeqD0FVp4oXKknBooQDn1O2qWaGX36q3+h787kF3Hmpwaf3mcMRm pGa3AZy1ljgawDJNtXQ1dwne3ifYezoU+BwV6UmOD/Co5wUQ/NR+ZkF7oG/dAHPK1zEfV FiML3rQ8mTWwx0VoKVdOsqUcfyjRL0GuRq1GYLHtRfdrCUrgCy7LYJBOl8IUXx+z13g== 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=liKi4rqp; 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 282AC606A841; Wed, 4 Nov 2026 22:36:41 +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=liKi4rqp Received: by smtp.kernel.org (Postfix) with ESMTPSA id C429F1F000C1; Wed, 4 Nov 2026 22:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793831801; bh=lGRevT01WQjFYbjZasnHtR/aBCf4yGamCHvzRa4NQZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=liKi4rqpzLUjjBMBCU2ZhXF3PhfyfeQOddrzSrH+N+QVYE7UARU89olnSSXQ0S8Em KeLJLbKrkUWGmGJpMajvcKk0Y+JP+AGH2j8td/oIa+Mvuf+tqR4k9AMHFDTZTPaBAG tsfpeKMUihMbrG66H43VoaFxTVWWcFOQnrVfGd/o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , Marc Dionne , Eric Dumazet , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-afs@lists.infradead.org Subject: [PATCH 6.18 0920/1005] afs: Fix afs to abort the rxrpc call on send error Date: Wed, 4 Nov 2026 16:10:53 -0500 Message-ID: <20261104211108.921112434@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104211043.516122098@linuxfoundation.org> References: <20261104211043.516122098@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells commit 3e6af08a571fe2943a006acf3e890f36322602bc upstream. Fix afs_send_empty_reply() and afs_send_simple_reply() to always try to abort the rxrpc call rather than just aborting on -ENOMEM and otherwise abandoning it. If the call is already complete due to network failure or a received abort, this will do nothing. Also make afs_make_call() always abort on send error; again, it does nothing if the rxrpc call is already dead. Fixes: 08e0e7c82eea ("[AF_RXRPC]: Make the in-kernel AFS filesystem use AF_RXRPC.") Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260824091645.415423-1-dhowells%40redhat.com Signed-off-by: David Howells cc: Marc Dionne cc: Eric Dumazet cc: "David S. Miller" cc: Jakub Kicinski cc: Paolo Abeni cc: Simon Horman cc: linux-afs@lists.infradead.org cc: stable@vger.kernel.org Link: https://patch.msgid.link/20261006133011.531806-6-dhowells@redhat.com Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- fs/afs/rxrpc.c | 37 +++++++++++++------------------------ include/trace/events/rxrpc.h | 2 +- 2 files changed, 14 insertions(+), 25 deletions(-) --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -441,10 +441,8 @@ void afs_make_call(struct afs_call *call return; error_do_abort: - if (ret != -ECONNABORTED) - rxrpc_kernel_abort_call(call->net->socket, rxcall, - RX_USER_ABORT, ret, - afs_abort_send_data_error); + rxrpc_kernel_abort_call(call->net->socket, rxcall, + RX_USER_ABORT, ret, afs_abort_send_data_error); if (call->async) { afs_see_call(call, afs_call_trace_async_abort); return; @@ -857,6 +855,7 @@ void afs_send_empty_reply(struct afs_cal { struct afs_net *net = call->net; struct msghdr msg; + int ret; _enter(""); @@ -869,21 +868,13 @@ void afs_send_empty_reply(struct afs_cal msg.msg_controllen = 0; msg.msg_flags = 0; - switch (rxrpc_kernel_send_data(net->socket, call->rxcall, &msg, - afs_notify_end_reply_tx)) { - case 0: - _leave(" [replied]"); - return; - - case -ENOMEM: - _debug("oom"); + ret = rxrpc_kernel_send_data(net->socket, call->rxcall, &msg, + afs_notify_end_reply_tx); + if (ret < 0) { rxrpc_kernel_abort_call(net->socket, call->rxcall, - RXGEN_SS_MARSHAL, -ENOMEM, - afs_abort_oom); - fallthrough; - default: - _leave(" [error]"); - return; + RXGEN_SS_MARSHAL, ret, + afs_abort_send_error); + afs_set_call_complete(call, ret, RXGEN_SS_MARSHAL); } } @@ -913,12 +904,10 @@ void afs_send_simple_reply(struct afs_ca ret = rxrpc_kernel_send_data(net->socket, call->rxcall, &msg, afs_notify_end_reply_tx); if (ret < 0) { - if (ret == -ENOMEM) { - _debug("oom"); - rxrpc_kernel_abort_call(net->socket, call->rxcall, - RXGEN_SS_MARSHAL, -ENOMEM, - afs_abort_oom); - } + rxrpc_kernel_abort_call(net->socket, call->rxcall, + RXGEN_SS_MARSHAL, ret, + afs_abort_send_error); + afs_set_call_complete(call, ret, RXGEN_SS_MARSHAL); _leave(" [error]"); } } --- a/include/trace/events/rxrpc.h +++ b/include/trace/events/rxrpc.h @@ -20,10 +20,10 @@ /* AFS errors */ \ EM(afs_abort_general_error, "afs-error") \ EM(afs_abort_interrupted, "afs-intr") \ - EM(afs_abort_oom, "afs-oom") \ EM(afs_abort_op_not_supported, "afs-op-notsupp") \ EM(afs_abort_probeuuid_negative, "afs-probeuuid-neg") \ EM(afs_abort_send_data_error, "afs-send-data") \ + EM(afs_abort_send_error, "afs-send-error") \ EM(afs_abort_unmarshal_error, "afs-unmarshal") \ EM(afs_abort_unsupported_sec_class, "afs-unsup-sec-class") \ /* rxperf errors */ \