From nobody Thu Oct 9 02:52:15 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 61B3128A708; Fri, 20 Jun 2025 12:16:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421785; cv=none; b=JzZIVcivFKRFq8GgWegXbgCXSa6A4aQLSq00kfM9iqsAcGXjnYz1TxVfxyAFQvbf33Nq73rYgByrzACQnQBle7XxPKQpeHcRWw4tMow5I0cAmbNHgoUI00xgcWTrJpmQ6gy6z+dfASAHhbobSIPw2QydDVLhuxDbmhIYwfYZrzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421785; c=relaxed/simple; bh=IF42cJs4MpkxNJaOlRvE38Bf4YnfgCEoIGhaNqdYM1c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FTqk/g4eTfO/ItarLg1U8F8lN6lf8pISJQP60IXpKsNlOz6RCmI4j04VLMb0EB3P13LlxzlVR3WFJTK/oRlJwWUCJmXILQFsgiubSjo3qVX68K7M4gg5xiIJgl0OSTa+bQEcAwiEgsN/45lW4+HlJlsj0SUlVaWweT33j/muN0Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lzTUBPAc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lzTUBPAc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 280A9C4CEEF; Fri, 20 Jun 2025 12:16:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750421784; bh=IF42cJs4MpkxNJaOlRvE38Bf4YnfgCEoIGhaNqdYM1c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lzTUBPAcPmgowy09KaNRfEDWQsZOSfFh3Mx7dxyjaNuDHxQOvRer9+naOTQ+BfrOJ Q+444dxfGkL+XS72mUoP50f3Hbpoa7VaffxID0gQmnCuKvA75XuZtwnw4hUcONSuiv bFq6r9znkcbpNboLxEv3A1lS5yK4tRimoCJIylldgHY55Xnzol7cLOIc4Zgts1lQ7Y X8R6AakrK2Jm+ykIV+s3FUVDNc2nlKVyTJL4NU37jaxFd8yhH5iY7rwvQ2ig2WVeXG KAKqZVPgFEGLSmp3IUNhLfIOq41qTFFryMobiVcGwo5DXGaTCKqFQq4RLLRMqt3iHM Mog/280FIE8vA== From: Jeff Layton Date: Fri, 20 Jun 2025 08:16:01 -0400 Subject: [PATCH 1/6] sunrpc: fix handling of unknown auth status codes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250620-rpc-6-17-v1-1-a309177d713b@kernel.org> References: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> In-Reply-To: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2925; i=jlayton@kernel.org; h=from:subject:message-id; bh=IF42cJs4MpkxNJaOlRvE38Bf4YnfgCEoIGhaNqdYM1c=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoVVEVvvpIAEQO5lCfWNBwJe9R34e2PT+so9jUm Cu3j0gleJWJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaFVRFQAKCRAADmhBGVaC FcV0D/0ZDpZ+30hMQqCnHD49j0iVgPsIhEkt1dhp80pnrffQmqkn/0vfx+KAD7PMqIpJU05jfQs rLZ72ZOH8hmgtzPytt3RsoduhyB6zk8hlKThPI0gEnHbBxF4lHSNvhVcPIy3wXUtU/2RRU4FcZj kw69dWbHVtSATg8iHVhC296Tt3yO7I0P4+VA45hr9AroEayniBp0f/KjFMQ13+vfCkTJYM2dJG+ rYwwz/FqKxJOcQywl+ZFPR58sUfmD23bzw+mLJ96GCpGn2VQeD2bveYVSCBhBDiRdycK645/vzU TYWsb3vgjJH6avrEWAyuIPc1p3ouwT14xYCBpjcQhDFKBEctOvvOz3aBluWLubtUv8Q3EJBZOYo 6EzbRyO5wPP2co/tladL0YLojhuKmGr/9U3q1BVcaa4gUMEtDLEVatWtD1oo/OPMiwKwGNW6+pn AX35SH1zVMeCx5kulKehPSWwAzYQQECzZwpxIY5wODUm/I38/Jmvx3EhfQIpPNsVPAea5VEuKZ1 XVPJiSyj2s8VOHkqhEgp8FqAe+HFZH/61G8dbZZTI0Q/zstgMty1sO+MHihH5N/0LOFohHgUFqp d/Ayb40pWw+q9udR/C4x1SMAjhtGxISvhBDh5KFN1Pm6jExYUtwm4PWq6JKORok7ZgJJXallZtn z+IcszEj0cdo77g== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 In the case of an unknown error code from svc_authenticate or pg_authenticate, return AUTH_ERROR with a status of AUTH_FAILED. Also add the other auth_stat value from RFC 5531, and document all the status codes. Signed-off-by: Jeff Layton --- include/linux/sunrpc/msg_prot.h | 18 ++++++++++-------- include/linux/sunrpc/xdr.h | 2 ++ net/sunrpc/svc.c | 3 ++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/linux/sunrpc/msg_prot.h b/include/linux/sunrpc/msg_pro= t.h index c4b0eb2b2f040887d05b3951c9322c7175dd9329..ada17b57ca44ab65d0e4efc4cc1= f71b03f47412d 100644 --- a/include/linux/sunrpc/msg_prot.h +++ b/include/linux/sunrpc/msg_prot.h @@ -69,15 +69,17 @@ enum rpc_reject_stat { }; =20 enum rpc_auth_stat { - RPC_AUTH_OK =3D 0, - RPC_AUTH_BADCRED =3D 1, - RPC_AUTH_REJECTEDCRED =3D 2, - RPC_AUTH_BADVERF =3D 3, - RPC_AUTH_REJECTEDVERF =3D 4, - RPC_AUTH_TOOWEAK =3D 5, + RPC_AUTH_OK =3D 0, /* success */ + RPC_AUTH_BADCRED =3D 1, /* bad credential (seal broken) */ + RPC_AUTH_REJECTEDCRED =3D 2, /* client must begin new session */ + RPC_AUTH_BADVERF =3D 3, /* bad verifier (seal broken) */ + RPC_AUTH_REJECTEDVERF =3D 4, /* verifier expired or replayed */ + RPC_AUTH_TOOWEAK =3D 5, /* rejected for security reasons */ + RPC_AUTH_INVALIDRESP =3D 6, /* bogus response verifier */ + RPC_AUTH_FAILED =3D 7, /* reason unknown */ /* RPCSEC_GSS errors */ - RPCSEC_GSS_CREDPROBLEM =3D 13, - RPCSEC_GSS_CTXPROBLEM =3D 14 + RPCSEC_GSS_CREDPROBLEM =3D 13, /* no credentials for user */ + RPCSEC_GSS_CTXPROBLEM =3D 14 /* problem with context */ }; =20 #define RPC_MAXNETNAMELEN 256 diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h index 29d3a7659727dacc0f7cc2f4f18c589a524323c4..e3358c630ba18b0af13bc5ff8e1= ab2f884125da7 100644 --- a/include/linux/sunrpc/xdr.h +++ b/include/linux/sunrpc/xdr.h @@ -119,6 +119,8 @@ xdr_buf_init(struct xdr_buf *buf, void *start, size_t l= en) #define rpc_autherr_badverf cpu_to_be32(RPC_AUTH_BADVERF) #define rpc_autherr_rejectedverf cpu_to_be32(RPC_AUTH_REJECTEDVERF) #define rpc_autherr_tooweak cpu_to_be32(RPC_AUTH_TOOWEAK) +#define rpc_autherr_invalidresp cpu_to_be32(RPC_AUTH_INVALIDRESP) +#define rpc_autherr_failed cpu_to_be32(RPC_AUTH_FAILED) #define rpcsec_gsserr_credproblem cpu_to_be32(RPCSEC_GSS_CREDPROBLEM) #define rpcsec_gsserr_ctxproblem cpu_to_be32(RPCSEC_GSS_CTXPROBLEM) =20 diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 9abdbcbf247323207cba13546173b8fd28a15e24..195fb0bea841451ad48717d7936= 992e0a850f703 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1387,7 +1387,8 @@ svc_process_common(struct svc_rqst *rqstp) goto sendit; default: pr_warn_once("Unexpected svc_auth_status (%d)\n", auth_res); - goto err_system_err; + rqstp->rq_auth_stat =3D rpc_autherr_failed; + goto err_bad_auth; } =20 if (progp =3D=3D NULL) --=20 2.49.0 From nobody Thu Oct 9 02:52:15 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6091B28B4EB; Fri, 20 Jun 2025 12:16:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421786; cv=none; b=q4qDI+2nfttve7UVRr28PsZuxgIL2NSFdFyLa8gcnvUhUVQhPEmSzN+1AWK5ZAKHpsyMzVlY7IfjINcr68pW9qFPH7F/R94tQ/9UJhFXq6OiCCueySWAwsVHtyeb+oUg4EPPVCqS2VRaLSWEWHpU31aIki+M9M2Jog3jJMYENZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421786; c=relaxed/simple; bh=z098PYiyfIazl40EKda1JH9sBsWrUnkCbFyKswmpC+E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=n/wPuI6OiRrr0kzC9ad29SPa0Ln/2Lic322nkpeh2h0lgyxHW82BtfUJp6ebWgld0yb0xT60ZkA98cxb77ZLNrCgfdr9dTshEa+zBQsZbkU0tKBtHQU5nvxNncl1KTPnffekNfWkmbob/UgBKJTn/fLjNBqPNG3twR24LdSnGoI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EhOhHl0L; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EhOhHl0L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2334EC4CEF1; Fri, 20 Jun 2025 12:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750421785; bh=z098PYiyfIazl40EKda1JH9sBsWrUnkCbFyKswmpC+E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=EhOhHl0LWwJZej3m61MHZuzPg4JpAI2bkVXVulWfd4QQVehXYVrfhlaNhro2tovc5 /jE+BB0TgdztUT48JjgnDRlEIu3NhJZ2GVT2x1nEQaVvEQA2vV+SUI4OqHI7EJFNct 4PYVtUtSXUGoH3GmRB9QRl4a/wGqReeGLEaeNTydTjUBQ1Folo5uklQ7n8Fj9zwKna CNw9vkyir/IimkxXBbjXfJNIsvQXZqfbSCUC8EeECjkPuLRzbYMyUs/i6B9ypZp9zd XLzaN/z9Uy3YFd9IUqmBwMrQB2XqKG7cga0RBEG7k40YV+mSMEjFRvyJC3Wd+3DHzs JWQlgoZBBiJOA== From: Jeff Layton Date: Fri, 20 Jun 2025 08:16:02 -0400 Subject: [PATCH 2/6] sunrpc: remove SVC_SYSERR Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250620-rpc-6-17-v1-2-a309177d713b@kernel.org> References: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> In-Reply-To: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2250; i=jlayton@kernel.org; h=from:subject:message-id; bh=z098PYiyfIazl40EKda1JH9sBsWrUnkCbFyKswmpC+E=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoVVEVFMNL4DJL4/b6ik7FbJ/ZuHz9hdYc7E3m+ /haO0i8IuqJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaFVRFQAKCRAADmhBGVaC FZnfEADLZsADpvh2Y74hvcpGU0+lADGZp/FXzT4mBOGgzIoH6aTDZaevFkpGRU1vci+JWz15Qfc w01d+B5tfzJVo67dcvzZGD65HnjQ0DDfGCkxOE8HU2GXnjQGpVH/DWGXlqn0GvAiw7/S3gaBCcc 70UNHgpqIWVXGRc4g8Jt+6sFLiakviEvPKCnTkmrz+x5nhzc8fsMCUlugPImrsnI70ghp3qxY+t b3Q098hDjozguKPawxcYQQsd93Yf2yfdJcThPcvFGDs7SdxoDMNg13kH21NEAF5p7g/pmkvFAPY TvmovlKbTlexUZwGQtf/6z0HXxSUa3mI5sHFe9PvFYuLW2s9lEfRWuBRM30dx1TT+kRNesSx3CM BpIRun6OXZRkYX4OPeBIHyd2ezhjOSqgv/6RjTdZawR0Gv+BrWHvWDkkN4HaMGbvKU8sYE1wuK/ tAQwIwJB6jSAiHV4L64MZuO2WUUWV0g41+JefZLVq73qjLTtU1esog/2K8nLZbjsSxs/uEdLog3 BQ/opdxbU2o233tZQZMiaB/UuA8QiLVv1FMtEZ+eK1MEA9Eik2xOelLI3tNW92zZKbKHgdnTcu6 ze8KbKuD/Lo70bCgVtGbgurhnWGwvuaHo0VVB/kMDmDh0CndI8hnVlu3QBxj6s+rQqfiIQEvSEy qxYIxFJiuSeiCwQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Nothing returns this error code. Signed-off-by: Jeff Layton --- include/linux/sunrpc/svcauth.h | 1 - include/trace/events/sunrpc.h | 2 -- net/sunrpc/svc.c | 8 -------- 3 files changed, 11 deletions(-) diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h index 2e111153f7cd2abde7a1ac7daa5b5b8c932a82cd..4b92fec23a490dc8246dc0532fb= dd39244e233b0 100644 --- a/include/linux/sunrpc/svcauth.h +++ b/include/linux/sunrpc/svcauth.h @@ -86,7 +86,6 @@ struct auth_domain { =20 enum svc_auth_status { SVC_GARBAGE =3D 1, - SVC_SYSERR, SVC_VALID, SVC_NEGATIVE, SVC_OK, diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index ff11fa07cbe3cd6863d281af4f6ed1d3684cf9f0..750ecce56930699e64956636cc0= e7bb388596e87 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -1691,7 +1691,6 @@ SVC_RQST_FLAG_LIST __print_flags(flags, "|", SVC_RQST_FLAG_LIST) =20 TRACE_DEFINE_ENUM(SVC_GARBAGE); -TRACE_DEFINE_ENUM(SVC_SYSERR); TRACE_DEFINE_ENUM(SVC_VALID); TRACE_DEFINE_ENUM(SVC_NEGATIVE); TRACE_DEFINE_ENUM(SVC_OK); @@ -1704,7 +1703,6 @@ TRACE_DEFINE_ENUM(SVC_COMPLETE); #define show_svc_auth_status(status) \ __print_symbolic(status, \ { SVC_GARBAGE, "SVC_GARBAGE" }, \ - { SVC_SYSERR, "SVC_SYSERR" }, \ { SVC_VALID, "SVC_VALID" }, \ { SVC_NEGATIVE, "SVC_NEGATIVE" }, \ { SVC_OK, "SVC_OK" }, \ diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 195fb0bea841451ad48717d7936992e0a850f703..c6ceacedae28e2aafd15edd170a= 27cdaa84ec47f 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1375,8 +1375,6 @@ svc_process_common(struct svc_rqst *rqstp) case SVC_GARBAGE: rqstp->rq_auth_stat =3D rpc_autherr_badcred; goto err_bad_auth; - case SVC_SYSERR: - goto err_system_err; case SVC_DENIED: goto err_bad_auth; case SVC_CLOSE: @@ -1515,12 +1513,6 @@ svc_process_common(struct svc_rqst *rqstp) serv->sv_stats->rpcbadfmt++; *rqstp->rq_accept_statp =3D rpc_proc_unavail; goto sendit; - -err_system_err: - if (serv->sv_stats) - serv->sv_stats->rpcbadfmt++; - *rqstp->rq_accept_statp =3D rpc_system_err; - goto sendit; } =20 /* --=20 2.49.0 From nobody Thu Oct 9 02:52:15 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 53DF228BA9A; Fri, 20 Jun 2025 12:16:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421787; cv=none; b=NUjJsKFr7bJy7U5jlnFk6l9dRumLSCYBRd9pHltLMxNzPRxUQ2ExWI+P+4TDuLMjHrql6n4wVReMuzXyhSu3QExaIfoekbpB8UjI41Z2LsOT84t178lLTsnCyRJyjoJ5oAEZuvSf89tYbmLDGYbS4covxJti7BvDkPC4IlnaRr4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421787; c=relaxed/simple; bh=oNgszznr2KqoXJ7xUI50gbvBuN4NLNMjt7UJRfxDNqI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IkZpIuWWfp4z39Ojo0v+N+SokTewverj+neddMM0TwM06RCzrF3d4n//E7PwPjbOIyQyCk8bW6kuydOR1lvCKR9Er5gJ+bYrSFAz/N9sY4BrLbitiMJozzpHMG4a9iK36V0X6UjLLKLvkk+T68PLyIKV59fY2/htdZmjGyTK1/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KE9uf9Or; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KE9uf9Or" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E85AC4CEF0; Fri, 20 Jun 2025 12:16:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750421786; bh=oNgszznr2KqoXJ7xUI50gbvBuN4NLNMjt7UJRfxDNqI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=KE9uf9Ort9knDAhF+YxxHr74jwrVuqATWVU3kYgZ6I1SJ81d/nVCoTgCljTlYGNAK qAlhMdtCsQ/bmdBdHYxUgP7VYwxJTw4eSYRisv/oV0Yk/YpTxYROxs6Ia7YEOrKVjV hhrWXiYu/SQ/PNKzDCCu3kPLngSDJywVSHpp1WPGSeymMvfmGvO6h0DuBN+NFAptCj m/E9rvHFdCoV4UMrTlkXoym4nDIDhvpixjrQhHPKCbE63BbdMdd6TQFh6djlTs5A1R eoMA8DwdhiHAGxkE+V7O7w2xBSLSrAo8vs6JopkiGuN+O21mgTWh6HUipth0XMngNg PEs/LjSob5vqA== From: Jeff Layton Date: Fri, 20 Jun 2025 08:16:03 -0400 Subject: [PATCH 3/6] sunrpc: reset rq_accept_statp when starting a new RPC Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250620-rpc-6-17-v1-3-a309177d713b@kernel.org> References: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> In-Reply-To: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1057; i=jlayton@kernel.org; h=from:subject:message-id; bh=oNgszznr2KqoXJ7xUI50gbvBuN4NLNMjt7UJRfxDNqI=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoVVEWiPuSHaYEhDYms+HTDATGjRe/SzPVbSavK uLCU9XDGBqJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaFVRFgAKCRAADmhBGVaC FYtzD/wKNvglorlkzs3kqUsGRkIB225hUEb0o3G+xgY3Um4aJP9MfUJ8WII200htwxhmZCCVOMp 1hmI0h7VGbzeYvIsxHJCq87Ya60a6sISag/FLhvif1qAPXZh1GBs2qoYDrlx+PvLsYkHJkNFA1H 4QONf0DaW3CPNolK5SSjplevqlhn4mSIXJZAO/odN0YvQumSa1pC9lRpNh9V0T8thrRX9omVQc5 92artEETOjgt/oc2zwnQkDlZ81/aI/4Gdtqj+XQibx7PKhiKPlTg1ASALxR3lwgzKHeIH/l5vIm sgKCfpE3kIXqdVUBeRjCGN6Y7+Gf3qh4L7No13sD/XhHOJwK2mJqaHEasSKi0qLw2FWtYfUbAVG HvW9HyNy8k8J9gAT08RVTt8RzOIg8e9mCboAkC5Egp8CTSMVkx2wKUaApP6ticaoFX6diMjFUih 0mC7vQbUN5nmktMqF0nC+hl2BohFZaxO/Cewc2Disnr4rJZPwqPb6eWoEHEhPwcy9zoSr2aj8WI 3WInFAX1+lzxiZ/5U4lXE1+yU5IaB/DWVKucH0+gh/TmdJTGRlXynElEAVm0gs8ZuDDbMALz2vf NAp5o4bCG6k1IVKYG6JzL//3pGLVhGGB2EBNiFsCWTVhp3VIvfHOoENdZrZX6DRcMUAa3t9H/ld y8KnhZgYvuaJyHg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 rq_accept_statp should point to the location of the accept_status in the reply. This field is not reset between RPCs so if svc_authenticate or pg_authenticate return SVC_DENIED without setting the pointer, it could result in the status being written to the wrong place. This pointer starts its lifetime as NULL. Reset it on every iteration so we get consistent behavior if this happens. Signed-off-by: Jeff Layton --- net/sunrpc/svc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index c6ceacedae28e2aafd15edd170a27cdaa84ec47f..b1fab3a6954437cf751e4725fa5= 2cfc83eddf2ab 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1334,6 +1334,9 @@ svc_process_common(struct svc_rqst *rqstp) int pr, rc; __be32 *p; =20 + /* Reset the accept_stat for the RPC */ + rqstp->rq_accept_statp =3D NULL; + /* Will be turned off only when NFSv4 Sessions are used */ set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags); clear_bit(RQ_DROPME, &rqstp->rq_flags); --=20 2.49.0 From nobody Thu Oct 9 02:52:15 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4774728C5B0; Fri, 20 Jun 2025 12:16:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421788; cv=none; b=kV7bVh7f+/M7d7jlsuT5SSlJQEF6T5fY0wLzasKRroAIV/Q55gZfuCWNR4ZLrbJKqDIjYZ3tXLpM2f4f/MCOcM6LUS5ZYZ+Bc3a715Yh2e/kg9HVmF3HA6ucvUO3Kg8QQmv1frb+WQVVbNcs3wUx7x7m7TpZHy2NwMCqf4SgyrE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421788; c=relaxed/simple; bh=0l4BD1yI58JbChFClcUlD9ZRDy3Sd0tEqpzraV6lGrM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TdelfYqWj/WIfFaCD7NpPbthn7Pqgdsa0FWByxdmVHlT/ABYrnvg0ZSR/2uBTT/GgDxSgyJnn1Pxkvza+blwak5gv87QA72Ve77rVO/JfCB4OIdUDmDotJH36cslGsfn2fnK4Zik+SeYYmIi9QNp90kJYepfvQbdxRSYCeI4VXs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hn/dGWNV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hn/dGWNV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CEC6C4CEE3; Fri, 20 Jun 2025 12:16:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750421787; bh=0l4BD1yI58JbChFClcUlD9ZRDy3Sd0tEqpzraV6lGrM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hn/dGWNVV8myptoxZCC08dcKwD2/jlF+BOKGzNTSNjH1nTtlzS7EMbayYugBrCT+P LxKAHRKGrcQVyYokjOEw6nASpDJl1NVgYHKQHdnIOLgJRK2E6Oz9gX+ofGUgsznTCs yb89AgKLU6H9chovxOj+PL5S5ZT9aXvvpDBAEoNBj3vaaznAnn2BzveZT4tFHNxg32 brtII/WJ32mLCIKAPozQW8C69vkD0t/sZsr0RCuFoVTx84qroRPRZOtz4veocIgdTm WumGbrTvv2jkWlKYoF6Oi8P4S9/AcqKuF79iro5Q8y/9NUKjEXWQiCrRmHvkqX+N3N MhuxuSbnYPTPg== From: Jeff Layton Date: Fri, 20 Jun 2025 08:16:04 -0400 Subject: [PATCH 4/6] sunrpc: return better error in svcauth_gss_accept() on alloc failure Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250620-rpc-6-17-v1-4-a309177d713b@kernel.org> References: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> In-Reply-To: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1209; i=jlayton@kernel.org; h=from:subject:message-id; bh=0l4BD1yI58JbChFClcUlD9ZRDy3Sd0tEqpzraV6lGrM=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoVVEWAd1MllaNBLFKnFldt4g2w2AbxGkz+hpZe b148DBYG+yJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaFVRFgAKCRAADmhBGVaC FSLpEACwAzl96h1wHe3xdohmuU08mz5yA8o+0gn5wbfHhMKaFjceLynvWr2jAkLhNNVVfTuzTHd GYCHltMCX7i6pBWWed5jRcrn4kDzfWRQ/ZpVn6xZTkCMMeW9lOSGlFH+vTBRZIeO/YLFjrhz+c/ H+KKI7i2fDiyBxqgWpcbBOS/CP8RGCLwCTOFLQCzJG9d+PsxB89rDX3jhmYBdEwo8vP9pxxfHg1 E+EKSbajAyH9B849KoGlJr5ALJ1NZEcbHfHREX4om5q0T/2k3cmvsNnGYqfhpnWnO8xBzTnWtal dG+MJIdQwNcbspRSOyAPk+IQlirOgSLEQZF2CKxB1RYQiKKkclXUA+ldoxHlLH25T70gMJ6fC8J yGGAoH8hfNPMPiKGiDZg+CGZZwRZFd2SLVJYrWMMuNgCUL91TrdcDWAF+tJmVdfY2sx/2LsxfZ+ +iIslHcgWJReFsYJelxPs7qcU3mwRWmCHpjSpgUJK35Kfo+3JOgoO8B9SehWibCLw7LIQwijVYf 1BVXrjGxEgomUNFLTUmnAFO+Z5rt0HTY7qnP8Sst6aTPh+QzqNaWdr3hTuvkzwbrKyfYGPyyCNr ABftbpp9W3OaxaZRxq/T8N4mNmV0qUB2RU8Xk3GnTExHP4mO7wCtyt6frIW2mWBHbNFbAdlh7vo OkJBns9xhFCjCYA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 This ends up returning AUTH_BADCRED when memory allocation fails today. Fix it to return AUTH_FAILED, which better indicates a failure on the server. Signed-off-by: Jeff Layton --- net/sunrpc/auth_gss/svcauth_gss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcaut= h_gss.c index 73a90ad873fb9da659ba76184b2e2a0e5324ce0d..e82212f6b5620b7d9981702aca5= f1044f8a79804 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1628,7 +1628,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp) int ret; struct sunrpc_net *sn =3D net_generic(SVC_NET(rqstp), sunrpc_net_id); =20 - rqstp->rq_auth_stat =3D rpc_autherr_badcred; + rqstp->rq_auth_stat =3D rpc_autherr_failed; if (!svcdata) svcdata =3D kmalloc(sizeof(*svcdata), GFP_KERNEL); if (!svcdata) @@ -1638,6 +1638,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp) svcdata->rsci =3D NULL; gc =3D &svcdata->clcred; =20 + rqstp->rq_auth_stat =3D rpc_autherr_badcred; if (!svcauth_gss_decode_credbody(&rqstp->rq_arg_stream, gc, &rpcstart)) goto auth_err; if (gc->gc_v !=3D RPC_GSS_VERSION) --=20 2.49.0 From nobody Thu Oct 9 02:52:15 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 EF29F28CF6D; Fri, 20 Jun 2025 12:16:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421789; cv=none; b=d3celHEaglLjqAQaKDPxKM5bT8huKZiVQNiCzNiHUgsm/zbJoCG0GsQ3O2tKYlJhuNJQ9wbnEtysisqKnnPq6a3PrrAF4g4CZI4PY1h+mRGigLimoV9q88oXQVXZqjHT8VopkU4CEmoK532/MbAQE3CZc0X4/Jzh7vv43BAtTc4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421789; c=relaxed/simple; bh=cf+8nzovA1CjEL6DUkxai/zqOEpw1mZXQ4r1c3QpvAA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WdVUsz5b8rpZyJYmDOU8BMP+03FPOks1wUejPNXnIAG4CyvZGRPJQVm59iTr9m8wWnIAqt5RRP5+hybrbYTyT5CnDp/gYIMZK9Pk7gtqaSvIsK1QmZwx8MjeB4I/DbFNZOj9OyRdUybGJrAFqNDakAWcbEmDnYax7NQYNnhMppU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vJZ652e/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="vJZ652e/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A215C4CEFC; Fri, 20 Jun 2025 12:16:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750421788; bh=cf+8nzovA1CjEL6DUkxai/zqOEpw1mZXQ4r1c3QpvAA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=vJZ652e/ss4SDtoM7qFAyAcv40H5MlKPUk3gk+iRDf8L5MGwjsk2UrL8kxq0e+mnS CxdROLggxLhGzN3Ntzz/tCJFwvlxxXvzsqU50RlDhbNwUPDTGcnBhP6nNXbWssh1au Xq8yUZ4eHufQKjq4mvuSLOEgX8FLkFhSeqpBnCbGCamuvTFmrD2ise6kPRur0XlSXO z/Tlz+Tit0u0+GLbs+JYjaLmabWn9OUKpj/90wcQTVhnyam2fsSCjQWAuJf5oQ7nqO CUl95k0aseKeoT+Q4LIukeV9j9exa8h4M+qtIjiQRHn8j14Q2pvu8qOb/Vn7xnezyt +5DBlY/EIoaAg== From: Jeff Layton Date: Fri, 20 Jun 2025 08:16:05 -0400 Subject: [PATCH 5/6] sunrpc: rearrange struct svc_rqst for fewer cachelines Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250620-rpc-6-17-v1-5-a309177d713b@kernel.org> References: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> In-Reply-To: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=943; i=jlayton@kernel.org; h=from:subject:message-id; bh=cf+8nzovA1CjEL6DUkxai/zqOEpw1mZXQ4r1c3QpvAA=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoVVEWnMmJexRGAg+wqJl1mPnsUqjPM8mZIbv2m hyZQJKoTZGJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaFVRFgAKCRAADmhBGVaC FUwsD/90dg48flxlQLUiI/W2g3M/butAWG6HH7O0P5ctSDkMw90+2D1rqj4KH7Zu9xWADr7fpB7 ZQ6n+rks6iNDU+ane0IDYs6CSNeQjDfsBaPa8qZ2N9m6hI2a5xXDt9pu8X6HLcX7SjJsYZgXasX VwQI+s+wseA74+rcfb3a8alpGriDBjVKaniHswFz/ebyba6K7J+bnTDy/QayU4CLz1zL601vCMs bxnv0E/rEIP9SNwdCd8cNPpf6nEpUu0XcD2sM8auQHYv42Stk7bsEbUSmHeeNlTKBvF6JagGpBu 2hcMFtj5HSlSke42k6cLWXqzDl7PtIXOhz4ieX65SrLPOALf3KEA1AfnIBDPsgiPcr0SIJfFvxt 11TOk1nAWG2uZZ3ssXGYhpYCN+TYSfg4ch8UgyIjCugISCc+yXIICdOPKxChzhdrP/QGPAv6nEH O/hjx8MgITlVTEZTJhOGQAjJk3fa/UK8b7l2sGkZNhhsJeb6Y42e9vbLUfN/uABOUqkt6w3VtyD HH+twD8dCd1DP5IGuIK5VNyV8B3M8M1EyfaWz9vuOE3JU+1im/Sx/7asznkwuh3WFv63OeSh/kg 4abn8a1lSrJzM73zzCY12s62c15AuH65wLdI5VR8uYclq5wTofEh5boj0VNXKNv2LIaH8ctcFqb e/TA0g/SMavVxrA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 This shrinks the struct by 4 bytes, but also takes it from 19 to 18 cachelines on x86_64. Signed-off-by: Jeff Layton --- include/linux/sunrpc/svc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 48666b83fe681aa57075bef4a46e66bc0f0fe3b9..40cbe81360ed493bc16e64b5581= 8b21372e305f9 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -245,10 +245,10 @@ struct svc_rqst { * initialisation success. */ =20 - unsigned long bc_to_initval; - unsigned int bc_to_retries; - void ** rq_lease_breaker; /* The v4 client breaking a lease */ + unsigned long bc_to_initval; + unsigned int bc_to_retries; unsigned int rq_status_counter; /* RPC processing counter */ + void **rq_lease_breaker; /* The v4 client breaking a lease */ }; =20 /* bits for rq_flags */ --=20 2.49.0 From nobody Thu Oct 9 02:52:15 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 898AD28DF2D; Fri, 20 Jun 2025 12:16:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421790; cv=none; b=KRfHmi0hwJK2pbi9UeHjkO8Gc3lAvpqrAUuUvEc9AEwGoXiw77cBPplpWDGTRBH5vOaMOimRtaHBBWw8kU9j9h4D7JDYFzUYttBugh4uvAlxx07kX+Lbpg8K0n48Epy9V/IbUrRTsXFtk1fkf1kjL/qLZNw3yxQpli+UrXzgFvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750421790; c=relaxed/simple; bh=pWP3awNGNqNzs2Jc1fgQrbrmUVdGOnDCHnAUtdTgQA4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NMUZbcnCR/Ssdt0BaXJMTuYdnqCu++/T/VUoXv3gL46c1ggWObPCDzQYkGZzBIHd+nEXH/PY9f1o93t+KVBJ4PLvG2nZfZHBy8P9RFCnWDyoZTlSvFYm7HeeZTK507hFriBqpFE0DT0uxYX660D4ZfYMoYec3R0bz+To/YrBUTg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JKHOTJc8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JKHOTJc8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1601CC4CEF1; Fri, 20 Jun 2025 12:16:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750421789; bh=pWP3awNGNqNzs2Jc1fgQrbrmUVdGOnDCHnAUtdTgQA4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JKHOTJc8pZ6wYgeTmlP247h3ltTbC124gHeAL8gUoXYSMzzATq45slvZa3dqukAuy lE1I87Taj9TMorFZjBvZhDA950iXrmEiGuNg/kyInjL/5G8K7pk4pFPMZ6ETX+/v82 kB6gsHuovsCDgRdIYmVjBcHjEK8tCEYzll+jcmX5zI+vxtnY/RpI8eMCm4ZoPMy1BU ehFm3Ost23xvR3p4IgLyCGrLL0PjOxttRLpuxbLYGb7COYTaYUwQLU6SKi3eRP51oo mqmXSsKUpy8m/1Rl3/yfnjGridLvqM0dDojOLZulFB3I7452vgGsU0AJGQV1XmBkWA 4ebdbDI0Fzm4Q== From: Jeff Layton Date: Fri, 20 Jun 2025 08:16:06 -0400 Subject: [PATCH 6/6] sunrpc: make svc_tcp_sendmsg() take a signed sentp pointer Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250620-rpc-6-17-v1-6-a309177d713b@kernel.org> References: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> In-Reply-To: <20250620-rpc-6-17-v1-0-a309177d713b@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1166; i=jlayton@kernel.org; h=from:subject:message-id; bh=pWP3awNGNqNzs2Jc1fgQrbrmUVdGOnDCHnAUtdTgQA4=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoVVEWkIR8ZjAdi3/ACXz3eHnVV+XOTwjHzUWKN 5oRJsT59DiJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaFVRFgAKCRAADmhBGVaC FT1/EACfBu4ZnoPCGgD/wNFboovwWST2gmiiPQ6QfDvfGt48wbXxqlbUPz0FyS3VBfr0bxML8V3 RUS3oe5jW0UjLbHHwM6HJrgWlz6pua2O1sLuyAH+sSYhySKp/7kXBMiOpc5kIVQ49mLDlTLvOPV eEvCJfeBjTFjFAlCeuqx0T8Y/iJC3I0BZ/wi03v3bkTyX2PRfbrXo+V+wJt4ibafgpXx7+4B8rs eb747i/qLStDXDYXaAr7KmTxGdNo7oLo1JUhK/YM5URtESoNjPN5Ez56zM0LpVnpuwFzMj8Tgu2 3Vc+Kyqxml3VDKl7NL/8tjGqQqv0TZoevLZFk1IpmYczTNQhUMPdf7t3kzrXnvSyMi5NOjeAWvU Q4mWschx5Ltux+1kIgUwnOuwF+imFa1UjH0DEc528KoWgjFQxlxVMebIFD6/5k5c5kXRp0osUZb 5dPA8NFfHMdVfBlvcT7/TDleisDHUlXHHOIk6OPC60nia2vuLoLyuxlg6Hb8g6zFPYbjFiLNbsX Joel5d35ifTr6pRZ33ytmZpcBITroMqMeIG2kEEBnZU92PRsmn9t8IvndmzT4Je+09zDn18XaJL DT9+1uG+cTjB5r0CV3sfcoZpv7Av6WjT616iq8DAysfW5PWZ+9255jzVoT7DabrigpVujF29HlU OujS26nJ0YIsZbw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 The return value of sock_sendmsg() is signed, and svc_tcp_sendto() wants a signed value to return. Signed-off-by: Jeff Layton --- net/sunrpc/svcsock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index e1c85123b445bf387e09565c025d8dd815187a07..46c156b121db43c1bd1806a08a3= a9bf08b332699 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1197,7 +1197,7 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) * that the pages backing @xdr are unchanging. */ static int svc_tcp_sendmsg(struct svc_sock *svsk, struct svc_rqst *rqstp, - rpc_fraghdr marker, unsigned int *sentp) + rpc_fraghdr marker, int *sentp) { struct msghdr msg =3D { .msg_flags =3D MSG_SPLICE_PAGES, @@ -1247,8 +1247,7 @@ static int svc_tcp_sendto(struct svc_rqst *rqstp) struct xdr_buf *xdr =3D &rqstp->rq_res; rpc_fraghdr marker =3D cpu_to_be32(RPC_LAST_STREAM_FRAGMENT | (u32)xdr->len); - unsigned int sent; - int err; + int sent, err; =20 svc_tcp_release_ctxt(xprt, rqstp->rq_xprt_ctxt); rqstp->rq_xprt_ctxt =3D NULL; --=20 2.49.0