From:   Vasily Averin <vvs@virtuozzo.com>
Subject: [PATCH] cifs: handle async processing of F_SETLK with FL_SLEEP flag
To:     Steve French <sfrench@samba.org>
Cc:     kernel@openvz.org, linux-cifs@vger.kernel.org,
        samba-technical@lists.samba.org, linux-kernel@vger.kernel.org
Message-ID: <a71b8e8d-5393-25f2-1d63-991e903c262c@virtuozzo.com>
Date:   Thu, 23 Dec 2021 21:00:28 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
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?UDBJeVF1MWx3cFEwejNiTC9VeUZWWkd0Z0lVM2daQkJ4aktCaWQwaVJzMlNx?=
 =?utf-8?B?MVFIcHk2eWVxS0d0Sm1hNTBHQ3E0Snl6bUxtc2I3NktBSVZxdDlMMzRRai9P?=
 =?utf-8?B?Sk5aUWIrWGppbmVMd1BWMENUL0hFL1FvNWJvWXRyeFQ4QXhPaXk2eFRNZEJ5?=
 =?utf-8?B?NVp2TVltc2xtZ1JRN0h0dit3dDZpY0ZOZEdIUmtDVk1iQ2N5K0VSZlFzcG1Q?=
 =?utf-8?B?TjNHSmxwQ3hEeVVvTkM2NDZkRWc3UkRpVkpuanBNanRBMStKL2xZdDNVc0Nl?=
 =?utf-8?B?KzI1T3pBbzhBQ3pKaWVXWUovRVFPa3VxUk5mWUswV2Q4SDN6VElOWWkrNTFv?=
 =?utf-8?B?QVAzQ3UxRlNTZ2tjZC9BUlhSVjU3dzR5RFdhU1BrbG9JYjlYSzdmM2c3UFBr?=
 =?utf-8?B?Z0hIMW40SmsycTNPL3RFVVhXYnRxS3JNUlJGT3k0TVRiWi9GYTlwN2V1djgx?=
 =?utf-8?B?WFJ5WXpXTnF6dXJQdFdUcUJzeG0zN2FJVWZnSGg1UEZ3Znk4SEs4ZVRxTUFp?=
 =?utf-8?B?ejdTalBWUUEzbmtxYjV6VFVkclk5WFVFMGV4MjVlTklmUzhJeWJRQTNpQnJW?=
 =?utf-8?B?S1JVTFJ4WE1QODF1SEVyQXFNVnRDbzVnTEZtN2ZaVThOQzVsVnZQcDFlK1kv?=
 =?utf-8?B?dzBXaXNQODdvTG5HV2toQ2dDR3hFdnkvaGFTb2trdlBidFlMa3ZQSEVESkli?=
 =?utf-8?B?R3Nob2pLbUhlM0xwY1JEMUNremJnUG1WMmlCaVNlMFJBR3MvaEtIalN2dFZM?=
 =?utf-8?B?L1lRdVk2RG9ON3E2ZGowOGRhS0oyU0R4QnRRMnJqc0Vwa0xnMlVxc2FzNEVo?=
 =?utf-8?B?UTQ1THVtQVVxenV0dk5jdlVnTDUxODVIOFNNazU4SDlEajBLclRSUnFWOXVo?=
 =?utf-8?B?aGgrN2pJNzhIVWxzNXd4cDFHT1VJNjVRbW9ZaWNKRHdHK01tZWIzK016SXZK?=
 =?utf-8?B?d1lma09yQjlOSVR1UmRzMjJyQ2VES2NNNjI2NUd3dGFpRFFvQTV2UlRXM2JO?=
 =?utf-8?B?WTdUb0NRNmhkSUtnZnRuZllnc3pSaEpwTE1uZzN4U2Y3ZTNQKzVVMHg4d0pW?=
 =?utf-8?B?VG11ZFgyakdlWW1oYTZSOFlJbi9lNG1EYnhob2lUSFJZSVJJZXNWWlFuUllP?=
 =?utf-8?B?NjJOWklLWEVWNEdrejNLNHZlN2F3YS9Cd3FPaEJla3lhNXlVckVUbjk4eWRu?=
 =?utf-8?B?dmJQdHdieFVGZVZ0ZjhCaVVDN0IrSWQ4TWZBdW1OVk43d242UnozdytYR0J0?=
 =?utf-8?B?aWF0UzAveXh0bWc2SVJhTm9jQjBkU1Zab3d6TWxudHo0YkZNN2tLaFM4Vjhq?=
 =?utf-8?B?a3ZpZUJqNlllZWJYbEhRUk5kUDhxcVJYVjJWc0FPRHlMRGxzUGg5cUJjeXl4?=
 =?utf-8?B?eE1JUWJLdk53SDVLOE9jZ0xRTmhaNW8wNnhRaUJwRElabEJuem5KOHQrOXFH?=
 =?utf-8?B?Z1JZUHM1d05PdjJVTjd4SklnVXRRQVU5dExMdzVRRzZhcW90VXplc1cxdlla?=
 =?utf-8?B?a1Y4MDIvMUIwcE1jdUZreGlRNUhNWVFzY3BRZlJ3M01kbENpOXlkTFlCdTZE?=
 =?utf-8?B?cEN1N0s5d0ZWS0l5NTBoTlV2ZjlwVXlNOEJVdmt4aDdZaCtwWFU4SjVaSjh4?=
 =?utf-8?B?cEdodWNwcEZoTGY4NUpiSFRJUmpRTzZRQzBRbmdWZCt2bUxuY0ptUzB3NWt2?=
 =?utf-8?B?K1NJRGF4dzBDWUhMUi9OMFVDeVBHeHl1M2RUZ3Q3S0dIYnpJK2F3aUVuQkdp?=
 =?utf-8?B?V09BckFiQmo3WVZiaktUQzhrVW1mVGZsN1o4ZkRpSVgxcWdjVVhPbkNETkNy?=
 =?utf-8?B?RUEzYjUzenJZcFk1blY5Q01NdXA3SU9xbE8vNk80TndVR0F6eURmc00wazhm?=
 =?utf-8?B?TzlGSVMrYmZZMFFYSmxZTkxqSnRIYTQ5Qi9TYXpHbWJCWnhkb1g0Nkg3aDN3?=
 =?utf-8?B?WkZkTE84SUxvRFBndzhhSGFNaEJPL2N3a0JTYldhWGNnNlRJMWhvdWVzMzNp?=
 =?utf-8?B?MThuUnkvd0pCQStMejJOVzVKVXFqcmVIaDNHMUZ1UEpVT0hBL1hFWWRCdkty?=
 =?utf-8?B?MmtqS2Zmb2Nka1Z2UjNldzVTQ0szd3RTVWd6c1UvbXhjM3MwTFBEUncvb3By?=
 =?utf-8?B?K1F5SXdjU3k5RnVzWnMyL01sS1lRc2kwRzZib0tiNjFSL0xnd0RtN3plaUYv?=
 =?utf-8?Q?ZVIXQm7w1ocuFG/ZF5QCCvE=3D?=
X-OriginatorOrg: virtuozzo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4162e596-febf-45fa-ab4b-08d9c63e1b47
X-MS-Exchange-CrossTenant-AuthSource: DB9PR08MB6619.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2021 18:00:29.9511
 (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: XPgXvzh8kuaFHQvj3VlTqps/DHVUKZ5uHhZspaTalYq08lWoUuQwPni/QK3xXuJCXvEDDn55NUBlCfcfJliwGQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1749
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

kernel export thread (nfsd/lockd/ksmbd) uses F_SETLK cmd with the
FL_SLEEP flag set to request asynchronous processing of blocking locks.

Currently cifs does not support such requests, it ignores F_SETLK cmd
and handles the FL_SLEEP flag as an usual blocking lock request.

To work around the problem let's detect such request, drop FL_SLEEP and
wait_flag flags before cifs_setlk() execution.

Dropped FL_SLEEP flag should be restored back because some calling function
(nfsd4_lock) require it.

https://bugzilla.kernel.org/show_bug.cgi?id=215383
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
 fs/cifs/file.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 9fee3af83a73..6835458ee845 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1847,6 +1847,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)
 	int lock = 0, unlock = 0;
 	bool wait_flag = false;
 	bool posix_lck = false;
+	bool async = false;
 	struct cifs_sb_info *cifs_sb;
 	struct cifs_tcon *tcon;
 	struct cifsFileInfo *cfile;
@@ -1890,8 +1891,17 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)
 		return -EOPNOTSUPP;
 	}
 
+	async = (flock->fl_flags & FL_SLEEP) && IS_SETLK(cmd);
+	if (async) {
+		flock->fl_flags &= ~FL_SLEEP;
+		wait_flag = false;
+	}
+
 	rc = cifs_setlk(file, flock, type, wait_flag, posix_lck, lock, unlock,
 			xid);
+	if (async)
+		flock->fl_flags |= FL_SLEEP;
+
 	free_xid(xid);
 	return rc;
 }
-- 
2.25.1