From:   Vasily Averin <vvs@virtuozzo.com>
Subject: [PATCH v2] nfs: local_lock: handle async processing of F_SETLK with
 FL_SLEEP
To:     Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna.schumaker@netapp.com>
Cc:     kernel@openvz.org, linux-nfs@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <202112272042.Xlz50x0x-lkp@intel.com>
Message-ID: <3e5d6777-9365-c853-071f-3e9fc4df922c@virtuozzo.com>
Date:   Mon, 27 Dec 2021 18:50:41 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <202112272042.Xlz50x0x-lkp@intel.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZlcwSkdvWm1CNyt6WHVLUlZ1ekhtNUpPMWhFSVdnZ2xNdE9PQjRRR3EzTFlS?=
 =?utf-8?B?V2UraGtvQitHU2p1UnA4M1VBL1dMRjVoMmtFRWducERCV0MzOFBNdWxYaGE0?=
 =?utf-8?B?dTMrWC9oc01GN0gvVnI0M1FOb0h0RTB5QU9UUklFdjY2QlJPVm5DYWFIVjBx?=
 =?utf-8?B?WWUwQlg5WHZ1RDdzSWhzNzR0dFpjWjdPdDFVdHd0Nkw2M3F3cjVoRFZ2WHBk?=
 =?utf-8?B?YUxVOHc1WFM3OHRsV3VHYi95TXN6NEhLZE1mcnc1RWtsaWR4MCtQbDdyQVJ6?=
 =?utf-8?B?ZTlXWG5PRWF1MEc3dG85N1lDcUhsSGNzMzVjU1BwV0V2b0VYQ2w3dEs5UVkr?=
 =?utf-8?B?YjF3L3NncFVjN1R6SURXZ3R1eFBKMGJjaWZkZ0tCeDdEeFR6ejRHaXA4ZHVT?=
 =?utf-8?B?Q2tFUnFGb3hJU0xOd2FQU3lMUG9kZ0JMdnJJQkptYzQ0czhGZ2xvOUtySWpm?=
 =?utf-8?B?eGF6cHZ1OG5tTjVwWE9wVXNabVUrSzhHWXdicVo3Q1ZTdXZjRGhhOHpYaFdl?=
 =?utf-8?B?d1hTNnJna2NDV2J0RndKQlI2ME9hSTA0QzB3S1orYzh3czFGMVJNNXg0SzYr?=
 =?utf-8?B?LzZRTDQ3bXlzaHNKQVVSK1E0dW53OU4za3gxdGlILzZIVDl0RDdHcTBUanU3?=
 =?utf-8?B?QWthbUthY2ttNjR3RmNMaThXL0g5Q1c4bzVlVTNDZ1p5NVk5UUlNZjBNZnRM?=
 =?utf-8?B?TFJEa2QzaFlCeUhYNTRKTVFlU2RkRGxqNmpMcXlVanFmQ3dSR2kwTlZuN0ZO?=
 =?utf-8?B?Q2RLRkZrNmpUUzNtcmJjY3dKdkNFY0NRT0h6ZE9yS2lpQzZrUEpoQXpiK0Vq?=
 =?utf-8?B?UUh0SGlYYXFSYmhaN2VyWkJ1c21KYVdVdlQ3NmFUN0didTk0dFhFZGlGUjJ5?=
 =?utf-8?B?VGF1b3RJQlpVVmlZVFdpVW11dlppNGw2TGJDOWlUWUoxWVNwVkluRUJ4SE9Y?=
 =?utf-8?B?VmwzbDNjcUt5MTZtalQ3K0twb2VoRFJlcGFJbTNzNG5oV1NCTElNZmVSUGZE?=
 =?utf-8?B?Q1JPMEp0bkxGVXFoL0hKM1AwaUNRR282NEJlR29zSnZaWDgvdFVEYVRWRUpB?=
 =?utf-8?B?T3pZRURqNllwYXUxVDV3UEFRanUzNWFIOTNnd0ptTTR1ZUYvVkd3enlXbkpL?=
 =?utf-8?B?SUsrMkpwL0pCOGgzMGVjL0YyUStSVmZ2NDliS25IU081eVltZHVhZGp2aWVD?=
 =?utf-8?B?Y09hd0hOR3M2M0ZvL1FIUEtBUkxOQW5NaWkwK1hQeDZETWpyWjFId291ZG1M?=
 =?utf-8?B?blZMRHpYYloyUEh0akRxTGgwVUpzUUJzeDVmYTEyV092RmZBTXJWaDhZTVRz?=
 =?utf-8?B?UTRldlEySHNiTVpLZ1VFR3hWR25rTmtxZ29TejBsUm5LOEFmWUprMGVhVGxv?=
 =?utf-8?B?WjRtZGFydUZEUnpGbHF5ejRlNlZUdXRYSVRFTXlYYUtYTnRBelZIa2kxZkFy?=
 =?utf-8?B?MTBmYjRKSFhnUjI1Wm1BaTdleEQvdVJSR1RFbDVzbmRjdWNVNFkyWmovV21v?=
 =?utf-8?B?UmNXSU1YOEZSWHlZMUFTYStIUUI2aGh0SFNUOTdDUlZOempsN0xLNUJLNEp3?=
 =?utf-8?B?MHp6Zm9DQ2NtK21vS216eDhVdnJMdDVQS0t3UTJJZXpEN3BzYVM2ZGtEWDJH?=
 =?utf-8?B?UnNUN2FNYzZMQ3IyelhmSUNRWDhNem9zUWhDaGtxUUNHZlN1SzN0SDlzSG9T?=
 =?utf-8?B?ZW9OVkFDRWF0Zy9VL3RVUVd4akViQXQ4NFVNWW5nM2grTGMxdS90VjlieW05?=
 =?utf-8?B?UG5uaEl5T3UxVlZSMTdMSE1qNldLNGkxU2pvVTBHZFFabXFKY3dFKzF2QmxQ?=
 =?utf-8?B?dHJuL3BwcXo2MzhONUs1ZXlTN2lJc3FWS001aGZtYWRKam5DT2N6L1ZJcDVi?=
 =?utf-8?B?c04yUHlwSW8rN00zcm9NdWd5VXVPMnNCcFVTVEVIdlIzOUxOWGxEblplQmUw?=
 =?utf-8?B?RElMOWF5OFlycW9UeHloeVNKN0dqTDlndXUvbzZUeng4ZHgrbE9uNDZydEIx?=
 =?utf-8?B?M0YxdDlxTlR2QW5Telo5c25hbzFLZlhtcmMvQzNybURFWXhiS3oycFdFNk11?=
 =?utf-8?B?MjdjRFJXb0d0cXhmRXBwNUNxcHZvdm15K1hZWk1zTXFybzNTdzFiNHBwRlov?=
 =?utf-8?B?VEhPMHhxeS9XS0x4YmtjYk5yYjFVdE5oQWp2UE1DdFhpMGlaNzBJbWg3T0hj?=
 =?utf-8?Q?BlZGGH5mB8iuVCATZaofUoU=3D?=
X-OriginatorOrg: virtuozzo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4688f9fd-bbc8-4b9e-16ce-08d9c950a318
X-MS-Exchange-CrossTenant-AuthSource: AM9PR08MB6241.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2021 15:50:42.2029
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: yjbRTuzaoYRQeb3ylJanlwh6V7yhypVX4BzWGYQwCqkZ/s+kHTz22q1oWX9JoHJy+I0uSyThiHuZPivS91iKyQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB5732
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org

nfsd and lockd use F_SETLK cmd with the FL_SLEEP flag set to request
asynchronous processing of blocking locks.

Currently nfs mounted with 'local_lock' option use locks_lock_file_wait()
function blocked on such requests.

To handle such requests properly, non-blocking posix_file_lock()
function should be used instead.

https://bugzilla.kernel.org/show_bug.cgi?id=215383
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
v2: fixed 'fl_flags && FL_SLEEP' => 'fl_flags & FL_SLEEP'
---
 fs/nfs/file.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 24e7dccce355..38e1821cff5d 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -769,9 +769,11 @@ do_setlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)
 	 */
 	if (!is_local)
 		status = NFS_PROTO(inode)->lock(filp, cmd, fl);
+	else if ((fl->fl_flags & FL_SLEEP) && IS_SETLK(cmd))
+		status = posix_lock_file(filp, fl, NULL);
 	else
 		status = locks_lock_file_wait(filp, fl);
-	if (status < 0)
+	if (status)
 		goto out;
 
 	/*
-- 
2.25.1