Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Dai Ngo <dai.ngo@oracle.com>
CC:     "jlayton@kernel.org" <jlayton@kernel.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH] NFSD: Fix problem of COMMIT and NFS4ERR_DELAY in infinite
 loop
Thread-Topic: [PATCH] NFSD: Fix problem of COMMIT and NFS4ERR_DELAY in
 infinite loop
Thread-Index: AQHZcjTL+lC/NtMgQEeKxrnLESBF9a8yqKsA
Date:   Wed, 19 Apr 2023 13:55:15 +0000
Message-ID: <C6D9F61C-796D-4CF5-AA70-367EF411E173@oracle.com>
References: <1681849891-29377-1-git-send-email-dai.ngo@oracle.com>
In-Reply-To: <1681849891-29377-1-git-send-email-dai.ngo@oracle.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?4zWY+D3LXIwF8NN0fby6arTv4BA0DufGQn4tsLP+lyih/1tBUmAOr5z8RIjm?=
 =?us-ascii?Q?G1HLYvuT+Z+u7oSgy7qB3zxsUF0Nd8FpucjJ8TsRR37ZishHM0scqvAPcVUV?=
 =?us-ascii?Q?UmJbHswtJSC0YiPToz+GMPYKAzOCG0Uwty8ZIYG1gv0XNEqjwOCG/49CAdAO?=
 =?us-ascii?Q?Xra23P7UHgYoy2CrqMnbeXwEt827ubQfbscENU4tJMFR3JWSOkMNCJagORGq?=
 =?us-ascii?Q?i4NdsDonVwxReKZ/U9qTc3Wkfk+xJZ69PGu0OZfVQN9KmjGg/QdudiyyeVbS?=
 =?us-ascii?Q?PBvcqfZwGwsWMhMwRJB1/9yqEbF1E0f4w+zyFNsIxUr55AlDGSnV12rosEPp?=
 =?us-ascii?Q?p6RuXCIiSNs4MAnu6JbcV1zirBS4oG0MwU6tWVkW1Gqj6pYPIM4vaJBDD/5X?=
 =?us-ascii?Q?br3+4Ed0FyW4evE7+2WhxMeWGqlQjHMB71oecGsvpNR7i4DfRZxMKmeb3aBT?=
 =?us-ascii?Q?BpG2cdpHDg/elF2Onvz8RkeKAD+9W+6pA7qnkldoJAe1rSx5rilDQhk/nxOG?=
 =?us-ascii?Q?86pxJdCcy7sqG6r4CkFt5x/A2Bg/hqGItLiwUvL4N6HWYWoCe8S7X0xpxlOK?=
 =?us-ascii?Q?jNstdKLlp48Y5PD+z18C4DJoP6QjBe11C/MyXFJRFnk2+ffEc5SY1MUpAfl+?=
 =?us-ascii?Q?Zwg1SoXAJhjGWobkhmqkkcM9oFsYpbYgLM6eeCadJewRUavPO2Xg836DJ62B?=
 =?us-ascii?Q?jCyVMFYIVoXuOwEnbWZtMCCyUsUIXhGk0BfJmjmmByCrbmAxLua/7BkgFKX6?=
 =?us-ascii?Q?pqc6JrIcGQ8EJsd/uxWEk8DKvvSY5a6IMKfa5tSd9KuktAmCrPOnr4tGnUse?=
 =?us-ascii?Q?fvwjp+zSGEhiBCiUMwCeEHYNEcl9GvX2SKWxBQNHCVx7x/hZjZksJIwVqGRe?=
 =?us-ascii?Q?3agY4FsxVKjjH/0LOGA/m7qJVesciK7yKxHZlZAo0HSNt9jpbqylLQD9kHhy?=
 =?us-ascii?Q?2HhP+tHGc8ISo3vRb7GvoJqKoo80XByHoYOyUOmw+05+eMFPZABZEMIpA/pN?=
 =?us-ascii?Q?ws1Ubu9xDOB0C1Ds3sz/cm5hHTPxDCykc5S1sO+Mczv/LeR8LGb5mMmQChdV?=
 =?us-ascii?Q?TjtlIPPjLW86eiXHy0DVL1+DXkpz+jKPBmxBxR4CHM9t1QUHJHTOFfnaS1EM?=
 =?us-ascii?Q?PgexjsME3GJZxWmRBFwBSaqeXTcYzfbA2yNYK3a18zSqGvMZTxHJ7fMYK4Dv?=
 =?us-ascii?Q?8JAIa/404nzLXNkq8rRNgLFnzdngSiCg0KuEqfkoL51ewgZF+gHNMxW2DSD+?=
 =?us-ascii?Q?1AcHskYDDi0oPMIhIOIuoBXI0MDVyEk+UCb23wqjvpSguD2qHkHNuhxkqdNa?=
 =?us-ascii?Q?bvVQRFZnup3XQEV8sMBELUmeoJ0fw8dJtKZ9waLvzFP95muPF1QaZayJujRr?=
 =?us-ascii?Q?AeCLS2PUVKpukEscnW8bvpqQmla3ZlT16/MywlNRdJCVAuxrRpANgvcjxrT0?=
 =?us-ascii?Q?P3ncQEpZZMRXaTex9mJdcS061ZP7s3EOzhXxZX+Wl1cVF69lq0YNPuHcHJYp?=
 =?us-ascii?Q?kamYfa37JkH8BKgGKsyoV4PbS7Nt12NjT+WOXyYeCJl54uHiSKhXWd1ty/5U?=
 =?us-ascii?Q?oQFzMoA34fs1y88RzIleBo/DB5+poWPiulDqKbrCYIPTRPySbrCDV6KYR1et?=
 =?us-ascii?Q?4w=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <0E31B35E49E5214DADEA2BD8C9DEAE8B@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MtSJaZMRG/+OAL3v4LfWcALd2qtpBKGdU4dsv4fNogXji+5nKFGjxJi5ouPFTa6ffwX2l6tTSV3EA/LTc2WEDZVabaJxRqhs6sIYsDM9ezYsxFlZglLbqLPZZxGBHKc0/Q/lETAOQ3etuKnTkn9rw3mcnCllMQhIwhCFelQkCmp4K7EKbaLc/idrGLADP/HQdKBx8PSYeh42oQUi+3dxgoLo+FBK+/cLF2EHdFyi17InyLZYA1mTXVabGCl2acLRmvXanqF1L2njT+U9rgdM8jPh9H0GP29VPH3nLGzOESGcLFffz4FWDnWXAnsdvyg1CivLD53ReWq+S67+deDZerJwEv9JGJEPoVvSVJ0n4vLxVE5gSsiJnYWeblItm71AkhEIZv50WCmvUZvcWrWf+vZu32WsQgsIH9loUKovVsRyXdhobODLvtcY10anKrnfqIGv/LK3FZ04Yl3gD0UYKD77a2mZPkQWpZHo0Zcpg12rhTcwJwYjPfCa4y6fW0DCvleQ8WZsydfGTRASd3TLz9fcurSxZ84hPLZ1V3yTixQeOvW0kbvmlF/1KOX6k6t/qIfJGPbQNV6IGTupzy2wA3Np4IVZfUuD8BPjcOUsRMb8txY3PXtmq/qexf7HVaKlfLk2ZPDTfVe6xpJ53KI3u5qDTOajaAiQonagMJODwryYYyaAMQfoDqo30AFlldlhtWDhys+BUNfUWLz6xd7/Ia6WiwTVA9ocCr7qV6yZaDU0vyXZldfpfOWkJBZFqxkBbQpDcgNIiwmI9KhYLEnBwmGyxjpkv+yykYzzFR9RqfY=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6648e1c9-87c6-4ef8-a50d-08db40ddb3fc
X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Apr 2023 13:55:15.4145
 (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: M46OY2ShTwzwPaa9zbbcriGdr29rlP61Q5uvtUpcNiWYNEV+MvvSqpLePJeqlHVNUvVs75VKFw/rdiiE4pWTgg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5352
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-19_09,2023-04-18_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 spamscore=0 malwarescore=0 suspectscore=0 mlxscore=0 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2304190125
X-Proofpoint-GUID: a3AzN6TzkgM17TZ5yHeGruJm9f_ZIx_p
X-Proofpoint-ORIG-GUID: a3AzN6TzkgM17TZ5yHeGruJm9f_ZIx_p
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Apr 18, 2023, at 4:31 PM, Dai Ngo <dai.ngo@oracle.com> wrote:
>=20
> The following request sequence to the same file causes the NFS client and
> server to get into an infinite loop with COMMIT and NFS4ERR_DELAY:
>=20
> OPEN
> REMOVE
> WRITE
> COMMIT
>=20
> Problem reported test recall11, recall12, recall14, recall20, recall22,
> recall40, recall42, recall48, recall50 of nfstest suite.
>=20
> This patch restores the handling of race condition in nfsd_file_do_acquir=
e
> with unlink to that prior of the regression.
>=20
> Fixes: ac3a2585f018 ("nfsd: rework refcounting in filecache")
> Signed-off-by: Dai Ngo <dai.ngo@oracle.com>

Since we are very late in the -rc cycle, I'd like to apply this
to nfsd-next. The Fixes tag will ensure it gets backported
appropriately.

However, this patch fails to apply to nfsd-next. Can you rebase?


> ---
> fs/nfsd/filecache.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>=20
> diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
> index 6e8712bd7c99..63f7d9f4ea99 100644
> --- a/fs/nfsd/filecache.c
> +++ b/fs/nfsd/filecache.c
> @@ -1170,9 +1170,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct=
 svc_fh *fhp,
> * If construction failed, or we raced with a call to unlink()
> * then unhash.
> */
> - if (status =3D=3D nfs_ok && key.inode->i_nlink =3D=3D 0)
> - status =3D nfserr_jukebox;
> - if (status !=3D nfs_ok)
> + if (status !=3D nfs_ok || key.inode->i_nlink =3D=3D 0)
> nfsd_file_unhash(nf);
> clear_bit_unlock(NFSD_FILE_PENDING, &nf->nf_flags);
> smp_mb__after_atomic();
> --=20
> 2.9.5
>=20

--
Chuck Lever