Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Trond Myklebust <trondmy@gmail.com>,
        Bruce Fields <bfields@redhat.com>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH] SUNRPC: Fix XPT_BUSY flag leakage in svc_handle_xprt()...
Thread-Topic: [PATCH] SUNRPC: Fix XPT_BUSY flag leakage in
 svc_handle_xprt()...
Thread-Index: AQHXmegQU6r+dlXomU6Gdriqyx89rauEoXUA
Date:   Wed, 25 Aug 2021 19:51:47 +0000
Message-ID: <86716FAD-E791-4F89-BED3-9AC934A281E7@oracle.com>
References: <20210825193314.354079-1-trond.myklebust@hammerspace.com>
In-Reply-To: <20210825193314.354079-1-trond.myklebust@hammerspace.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?IUwePii/emuxy/tuKhfD+iET8EiF9EUsOLvv6lzQjeNTEJgYz6gznLmc0iU2?=
 =?us-ascii?Q?Ib60j7DPxqfmPHDAOwrfIvPEzUuDcZJY93t6HyrbyV5/Ch8vOUP4eW84Sl8G?=
 =?us-ascii?Q?PFs8oY69kknhrEVgeTxff42LOYKMHRymM5onte32IIOQAHrtW9EPBs1rx1UN?=
 =?us-ascii?Q?FwoiHW6wGx4qmh+8wz9eNvMKFzibVoMwVKux2H+wa0ceZlR9r3vfqSrxlkTr?=
 =?us-ascii?Q?Q6Cl+9UrZ2VNTDkO/EoNtkM6Q3Ju7YPaj8ON3u3yUgERjg8vLmiguCV8BMie?=
 =?us-ascii?Q?FOLjizHSlimbJ0vzp7NkIaqJq/kLIjCF2DMlC011ZCLTwl1X6BLy0QNqvFns?=
 =?us-ascii?Q?1+RxlFF6UL3OrlilZEyo9SE22HGJ7RJHCMJpqH5E7biBUdK01yk8vggy08iI?=
 =?us-ascii?Q?hkbVMLvZuHyWDrZ0HmFhrwZp1ZwOhP1rkTXhMTvABb9M7P/aqZW30989rZ5/?=
 =?us-ascii?Q?zIX9ntZsNiDkUR06pN1ruMXc0m0wPhoCk2gGp2gOzKw6kdmD6MkEmFQoWNvB?=
 =?us-ascii?Q?p741LxRoxRQOc/7RyyF1u2dHtq78gaL/7tpw5n9v5+eVbmGalQ5XOCSJM1vp?=
 =?us-ascii?Q?oc21CHA3J5WTqze4hI1yOXp1pUKHpThLFc5msKFQygBGqjqOd+MFwfxCQLwe?=
 =?us-ascii?Q?tPnP6l7DOVszQMaWQA2Mzissh1u9KhYIeMBTHIC87K+sYEuH7BkYnYEsgr2y?=
 =?us-ascii?Q?ORXr6rBVJ41hBPh+xN5UxkKwAtr72A8h2nWtEEFqsE4HV6HcrVYD8helcOzp?=
 =?us-ascii?Q?2jm58eFUsl5BPdX1oqWSgkgOlaqvuWZD3FeqH0xmplAIabmbfYXpGmry8gNk?=
 =?us-ascii?Q?nyCTTe6PUJFQxmeJTnaFVhODk6p/p5uERrh52VlaHol8xyt6iO//VVvw0raR?=
 =?us-ascii?Q?mhbL+l9MX44ZIuZh30fvnQ1cfpm3//upznWlV1bN4BYnbvEP+xY5Apv8aSsj?=
 =?us-ascii?Q?o7t9xVTDFDMPrAR7FxkpzSSmOdHqkQ2K4Bxe49oINXm3ktG4zVhav+6ATIDI?=
 =?us-ascii?Q?E7Bj2hcP1ZvH4nkXZOzK4ik+JeDmDCuFuCCxNtra9qq0M7skSd3XnlS6gHxs?=
 =?us-ascii?Q?HOXWupBackTlCgzaGAZhnvDo015W4C7XvVMZqGYOP2dynGYhwNCWjUg7WGlq?=
 =?us-ascii?Q?G+rqUCYl+BBwOo2IF39dQZfQIavKlhg3TY27Y8NtZ3lz2D+n/lSnQZS3kgio?=
 =?us-ascii?Q?3eNFR6pJeu5Aw95sV/h2QDBjV2X3GnQZAfEuNqC0RbCQxOidD1GxdIKRKEhh?=
 =?us-ascii?Q?2UH5NU8TMiz2KX35gk/K8hObMknzSLLch6mkilWKKmK5UGrATzOAa2uhE/Ic?=
 =?us-ascii?Q?cacrRucKX/91NbspgMxBu2dB?=
x-ms-exchange-transport-forked: True
Content-Type: text/plain; charset="us-ascii"
Content-ID: <7120C8DF53B17A41BB1E2B429B2B94E2@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4688.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2630e649-c713-4169-ade6-08d96801c5ba
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Aug 2021 19:51:47.0441
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: wXBLLU6tygRlYcY4kdwSeejRbHHH8pwapgwhV9R7wD8eHfm+qL2Qr004bGpnFaFNc3kQHN7r97s0PtW6dk52cg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4558
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10087 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 malwarescore=0
 mlxscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000
 definitions=main-2108250117
X-Proofpoint-ORIG-GUID: po2Bh1fsXNqbf8CQ8A0c8EDB1hHi7Qkp
X-Proofpoint-GUID: po2Bh1fsXNqbf8CQ8A0c8EDB1hHi7Qkp
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Aug 25, 2021, at 3:33 PM, trondmy@gmail.com wrote:
>=20
> From: Trond Myklebust <trond.myklebust@hammerspace.com>
>=20
> If the attempt to reserve a slot fails, we currently leak the XPT_BUSY
> flag on the socket. Among other things, this make it impossible to close
> the socket.
>=20
> Fixes: 82011c80b3ec ("SUNRPC: Move svc_xprt_received() call sites")
> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
> ---
> net/sunrpc/svc_xprt.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>=20
> diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
> index 5f0d33ca4bdb..b3cff4077899 100644
> --- a/net/sunrpc/svc_xprt.c
> +++ b/net/sunrpc/svc_xprt.c
> @@ -975,7 +975,8 @@ static int svc_handle_xprt(struct svc_rqst *rqstp, st=
ruct svc_xprt *xprt)
> 		rqstp->rq_stime =3D ktime_get();
> 		rqstp->rq_reserved =3D serv->sv_max_mesg;
> 		atomic_add(rqstp->rq_reserved, &xprt->xpt_reserved);
> -	}
> +	} else
> +		svc_xprt_received(xprt);
> out:
> 	trace_svc_handle_xprt(xprt, len);
> 	return len;
> --=20
> 2.31.1

Looks correct. Bruce, perhaps you should pull this for 5.14-rc.
Linus says he expects to release 5.14-final this Sunday, fyi.

--
Chuck Lever