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:     Jeff Layton <jlayton@kernel.org>
CC:     Trond Myklebust <trond.myklebust@hammerspace.com>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 3/4] lockd: fix file selection in nlmsvc_cancel_blocked
Thread-Topic: [PATCH 3/4] lockd: fix file selection in nlmsvc_cancel_blocked
Thread-Index: AQHY9gTwwKmHpOWzOECaqHw1tBDcK646LKuA
Date:   Fri, 11 Nov 2022 20:29:54 +0000
Message-ID: <1AE4E7CF-F76B-42E8-90D7-5DA52AFDE66E@oracle.com>
References: <20221111193639.346992-1-jlayton@kernel.org>
 <20221111193639.346992-4-jlayton@kernel.org>
In-Reply-To: <20221111193639.346992-4-jlayton@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?RfGcv5bU1VbwNhJwe9bOp77djzZjiP4Nc6PdJQb4zBT+JBFiP8p4PqhOfG18?=
 =?us-ascii?Q?oOqsaG2vugVtWH+xjNvxejmnCNXVyT8AqF8kWkk/ims9khVJ3lqFu8VHL0VA?=
 =?us-ascii?Q?gtiiHpWy1kobPCdjZHKy63MWETDR0Ll6i2C2BcrcVybZ0dztPBwXls4zpN2n?=
 =?us-ascii?Q?eAyz4ICZHBwYyqrFYc3+R2N4fafi+l/EWJEBSv99LoFhIhltbH0EUpvx5Bk1?=
 =?us-ascii?Q?yqYXV7he2Ag5TYuWCNtd7y5nWZQzSX2ivhoMcRrM9zncT9vhU1hHdIWM9928?=
 =?us-ascii?Q?5JIJcaaByyLTVtFyqM3Ep683yGe7GlVF+BezxMLf9A14NDSMkRHm3tAST38x?=
 =?us-ascii?Q?Ghfy4WnvIynSe5jMehITO0lr+Phaoo+N6Owz32Z2YXBEJMXugiOXRVnqUkV5?=
 =?us-ascii?Q?/F8E5lSPmqwRKu7THVS055FFc4gGKFT0yFNusPphx/p25yzQM95hq9CPHMZl?=
 =?us-ascii?Q?am8E+ODzPLD8q3eJiGsYWmxMGQuw3yAXRGYFJOjyUM03a8Jh/yPUMnCgVN7v?=
 =?us-ascii?Q?M93Bs43Ib2HHv+uwft571uz7tTcdaIJELu+hSkkFgR9VSGTMx/kF26BD/vSw?=
 =?us-ascii?Q?jNlxBWIqv9yJVgF16g1OtDmTy84kScgYdmPJgBVyYMsd1kk15Re9brrLKi1P?=
 =?us-ascii?Q?iJxPeCa21Nr3xZcvQOzrou89F8CtqY8d9IM16I4xZuDmTohMF7P2RUoSOwP9?=
 =?us-ascii?Q?mTdZu4fLUv9ucwNCNH+EUEV4qac6ah2k6Re0cdZPd+ZFSRaGPg14HATLVkk0?=
 =?us-ascii?Q?M7kPQA8iR4RNZGevxgRuUUr22D5infC2uN7zsWKGIvz5Y8F1N9OURw/YDu9E?=
 =?us-ascii?Q?vh5pFHtV+wMFcCWD4znNo/Ok+74ciA8pXnZdQ+TGfjY/Ca1oft2xp6+hnGEf?=
 =?us-ascii?Q?p07PVfLsOj8+gbl7ml3Ipy9ljfZGGOK0bdeCMM8bpEMniq0X3TGhXRBVC7Xe?=
 =?us-ascii?Q?nLkwAi3x2+G89R7kGnGWw2/znvujQTfOOkQAekM9yu6pHswXNd4UiOZuuIYl?=
 =?us-ascii?Q?a5YRdIeDkbf/qXQ1Rpdy+etVerRybikUVf8d/X6GHUf1Hkj9CiyQzZAD6VFu?=
 =?us-ascii?Q?fbFnmd3Vm5iojMliVTD8uhx5owIwT+YF0KFGwA63GnEY1769GhhYkO75XBUM?=
 =?us-ascii?Q?HqqfBxnAJNywAV1ox1cNRSuAgJJ6Ys/MUgshZJbhiwFPxqlE7Jguq1Ogj/mF?=
 =?us-ascii?Q?1g+ebfqwAszkS+AjCqiXLxm0OjtCskvtSI776u1a3QsOiA00e+kjEB3OtkZr?=
 =?us-ascii?Q?1l/Zh/vkGUB2UEoVFAR/aJmMbrAV80azQaOt4SD7uTCmpZmUaEKpxGDUr5zI?=
 =?us-ascii?Q?zte/ThSpcI/wty8qePEMJHWznle3TijGNg+jZpGd9sERqkkBixWGV8f/0TSC?=
 =?us-ascii?Q?2gsvXsdd59/Xm0yufJ++JjCFHOlch7M3c2gfC8rzxbCiTXtyPEez53MTz/AR?=
 =?us-ascii?Q?Vm1WFfswc8m10vGV85ievNFBaYKjgF0ckhgwvjjEelwI75lsHFkeWK4+2e8m?=
 =?us-ascii?Q?gscyk58q+Y/7XRfQI/futeW53nB+a6miigG4qiliMHEAH+K5zZTK0TalSCej?=
 =?us-ascii?Q?XVMzXVyfGdEq/bC/poBEjZh9ExDl9lxp/ZGvflOi9ldmXV8kOutuTtiQYdOc?=
 =?us-ascii?Q?MQ=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <B7BB9F97E97BF740BB363CD03DB99AB2@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: rBLWsJwb5HfgvBV4gXUSIBT7w6YfDgIx6zO3Q5Iv5pxyelAOL0UpeGJusQcbrG3g27YIVPsc9pwmbFTMxLR5K3WHZ8CDjBOYojoGpFhZQd9hT22T3Uki4Qae89PKc1z2Zb0kMsJ65I1H0fYzhBFtnS9S4mWWQkV1Qs+qk4MuBJhafUW7aRQ1jLSTmkKNvcjQ7By2gXwxh+vdM+1Df9zQJZDLBIrqHv8Ok3VzYi7MN8Hyc1GhpaC7WXiuxCmUDmajMUb6cQilZpIq/xCVXZfYzNOlh4hkImZFeuPKOhVUcgoURL5qlJnj/2XcNXct1YU7iYNvTDdX89rIcGwPY6gGsVJMxUOnexRU/3qdd3lYrjpqME+9mxAKQGr/YDhihXmQ4OKhKH6KfcWbCdXKElGIxwa3+vC4QS6oiNx259wgqwWefSoGOOUc3FE9xFI0AiYAUdpDw1/ZgK39YF/oR4GI22aZBg1hxNVU1/oesYI7/qZVEMAGwCtNsotsO9wqEDkAzFf0SxfVNXkBsQP2h/WRSvdXeBwznmBDD+eSa2sLkRLWtb/rvE5eBes5MHt5icKIh6dQ3JVw1tUxKUC6RG8s2iFGqkHlDL73K/+noN7GXxhsl5qkHrJ+gqrTZPDJ/+orD0YISquzxMrKzWVfz14NQUhWdpWYfwbaqFFGjxtzmj7TIKCzVcHn+3Gw0z/8ItUUFHHsLMj6cKYgXs3ZoSSgM2Dv3iBB5MSQF8VN6TtHyRpfUzsdbRH4uFP3NrGE0osc8vIKpcbxuOlqa6GdsOLwsXvTc5K3w2rgpwG6eQZBPAeQXf2MpXj7Ydv//t1u6BsMqTm7FkPvHm/0QELsFtyU7g==
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: 7e0b1a12-fce7-47c5-142c-08dac4237e55
X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Nov 2022 20:29:54.8282
 (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: KzTW/mtaSCbAMjrTJj/Y/a2Ttg9iD0FPIFvtl9odMrXAFM+Y+UlZK11qp2DDSlagdO+qlqcLaa9kAewAfQgdBQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4353
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-11_10,2022-11-11_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 mlxscore=0
 suspectscore=0 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000
 definitions=main-2211110140
X-Proofpoint-GUID: CZkLwPIPvwRd9bryrlNuAvrJQbbaR8w_
X-Proofpoint-ORIG-GUID: CZkLwPIPvwRd9bryrlNuAvrJQbbaR8w_
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 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 Nov 11, 2022, at 2:36 PM, Jeff Layton <jlayton@kernel.org> wrote:
>=20
> We currently do a lock_to_openmode call based on the arguments from the
> NLM_UNLOCK call, but that will always set the fl_type of the lock to
> F_UNLCK, the the O_RDONLY descriptor is always chosen.

Except for the above sentence, these all look sane to me.
I can apply them to nfsd's for-next once they've seen some
review on fsdevel, as you mentioned in the other thread.


> Fix it to use the file_lock from the block instead.
>=20
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
> fs/lockd/svclock.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>=20
> diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
> index 9eae99e08e69..4e30f3c50970 100644
> --- a/fs/lockd/svclock.c
> +++ b/fs/lockd/svclock.c
> @@ -699,9 +699,10 @@ nlmsvc_cancel_blocked(struct net *net, struct nlm_fi=
le *file, struct nlm_lock *l
> 	block =3D nlmsvc_lookup_block(file, lock);
> 	mutex_unlock(&file->f_mutex);
> 	if (block !=3D NULL) {
> -		mode =3D lock_to_openmode(&lock->fl);
> -		vfs_cancel_lock(block->b_file->f_file[mode],
> -				&block->b_call->a_args.lock.fl);
> +		struct file_lock *fl =3D &block->b_call->a_args.lock.fl;
> +
> +		mode =3D lock_to_openmode(fl);
> +		vfs_cancel_lock(block->b_file->f_file[mode], fl);
> 		status =3D nlmsvc_unlink_block(block);
> 		nlmsvc_release_block(block);
> 	}
> --=20
> 2.38.1
>=20

--
Chuck Lever