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=1793819598; b=ShbCVtUep875yFhHhVVQZ4CLX+gtcXpHwjCgn7XwrZ7QU3JgpMXE9EgAt/6d6+vBUoki RPwMucSkEh1wBkuKrkQhBcNY6DCxJtbN9H86rqcaK83e1nklDas5bj87AtuA6cf5lt6Es pMt3j7yoL2cAqa1eGf689f5Rm6/3PMwfwMKsxGHm9/r0kFdLtwhTAEx+XOmM/wKN7U7Ke Ahgj8Lq2v1ryGwIR6TqX/dmVfaYK4s6+Bk8D7ZYg1ek4T72zAXeAWbLqqMa5dNBIi95Od TM9327cwV5fTf53OoJQ6ENtyt7Ujosp+jSBFn0rccNQCZJ22tMRzo7AH9fKC2h2QjJA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793819598; h=Received:DKIM-Signature:Subject:To:Cc:From:Date:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=pDFdmpD3J3h06ytfXUPrCHVMwZjXjMCT08mVKdDf5IA=; b=NZcOaEMaHU9BaV69pkDoMTkTj+4URihLYijzgtVH++MHRm15p4+MsOmaijKz0i/C03kq BNPYZUjOPc6l+h/mwiTSufE7Iv0PTNH9haOWAI2ideWIBSpxgJDzcjM6w32EU8Y+T2RFQ 9Ij0ZyRp9HaUiJdOiSiQSHNbFubj1pqk8MthNpG/WBM7KYHhkp9c9vSIGoEK0qq/xKTG5 2VyYwI4/Jw7XjogqB6Vy1I2zrZ7kyuwYjSaDHP9pIegdWw745in48qML+Cil/xjqwgGIG y6xjgeFVur1dd6VBtZefAukN+iEjOC9+ExBA60PnifQUj/jqhb+ZIFmUnInjNl6TxaQ== 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=SpHLO1eN; 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 B95A1606A31B for ; Wed, 4 Nov 2026 19:13:17 +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=SpHLO1eN Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59C341F000C1; Wed, 4 Nov 2026 19:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793819597; bh=pDFdmpD3J3h06ytfXUPrCHVMwZjXjMCT08mVKdDf5IA=; h=Subject:To:Cc:From:Date; b=SpHLO1eNQQ38IDLqF0WtjAaLHbYQFDOhGRKmj1TmEr3BAk6d1dPablsq7IdbLVa7U vuH3CBFYkmcWrcYf0VisM3pDCWiPuR34eKCT8QeJ81LqmO5fnj17/qRyJ+Pzad30uh OLo4/h321ERmMoN6TISZkd4f6kVRffL9NVroLYto= Subject: FAILED: patch "[PATCH] afs: Fix afs to abort the rxrpc call on send error" failed to apply to 6.1-stable tree To: dhowells@redhat.com,davem@davemloft.net,edumazet@google.com,horms@kernel.org,kuba@kernel.org,marc.dionne@auristor.com,pabeni@redhat.com Cc: From: Date: Wed, 04 Nov 2026 14:13:15 -0500 Message-ID: <2026110415-paying-grill-e5e0@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 3e6af08a571fe2943a006acf3e890f36322602bc # git commit -s git send-email --to '' --in-reply-to '2026110415-paying-grill-e5e0@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3e6af08a571fe2943a006acf3e890f36322602bc Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 6 Oct 2026 14:29:57 +0100 Subject: [PATCH] afs: Fix afs to abort the rxrpc call on send error 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 diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index bcb8bb15d471..64dd32df8a34 100644 --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -441,10 +441,8 @@ void afs_make_call(struct afs_call *call, gfp_t gfp) 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_call *call) { struct afs_net *net = call->net; struct msghdr msg; + int ret; _enter(""); @@ -869,21 +868,13 @@ void afs_send_empty_reply(struct afs_call *call) 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_call *call, const void *buf, size_t len) 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]"); } } diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h index 704a10de6670..554dfb777b93 100644 --- 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 */ \