From:   Vasily Averin <vvs@virtuozzo.com>
Subject: [PATCH v3 2/3] nfs4: handle async processing of F_SETLK with FL_SLEEP
To:     Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna.schumaker@netapp.com>,
        "J. Bruce Fields" <bfields@fieldses.org>
Cc:     kernel@openvz.org, linux-nfs@vger.kernel.org,
        linux-kernel@vger.kernel.org, Chuck Lever <chuck.lever@oracle.com>
References: <1f354cec-d2d6-ddf5-56e0-325c10fe26ee@virtuozzo.com>
Message-ID: <00d1e0fa-55dd-82a5-2607-70d4552cc7f4@virtuozzo.com>
Date:   Wed, 29 Dec 2021 11:24:43 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <1f354cec-d2d6-ddf5-56e0-325c10fe26ee@virtuozzo.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?Wml2QlI4azNZaVF5d2Z6YUlKcW0yVzRjTzY0TU5CYnhGV2M3UTNZRTRjRTM3?=
 =?utf-8?B?aW55OFE2cy9tVm5iUjNLZVBUdlBsZWtKazB0enRFTlp2WjRnTUxnVUYxZnhr?=
 =?utf-8?B?SXg1U0tvZ2drTnZibjh5THo3bytaVXFQVXZwWkdpUCs0WElYREpQK0gzcVFO?=
 =?utf-8?B?WWVaMWxHVmU0U1RvcWN0dVVWNmIzZDZaekY0TGdFYUIvVmFGN1BaOE9oM0ZM?=
 =?utf-8?B?Z1FTL01ZUHIxbVFCNzI2REhrbXB3RCsrZlRhaXZzSkRLS0NKR2hDNlF3Y1la?=
 =?utf-8?B?Y1Jpa3R2bGtWRHpKNXFJRElDOVhkVGFyNnE3SXhuRzE2VWx1YnUyLzYxSThn?=
 =?utf-8?B?QnNNR1hmODFFWldibmg5R3NEQmdDeHdVVTBRYW1WTnJ5LytaWk9ZeVArYWhG?=
 =?utf-8?B?YXhxNnFJVlNucEpVTGFQU0JlRjR0WklhQm9SNXQrd0pZVlhLOGFkbk5relRM?=
 =?utf-8?B?S3V5TmMrNjFoYXVWR1FQVjRHeHIwTk1aalg0SURCaENMc0Z1S2diYml1OWtD?=
 =?utf-8?B?MDAzWkNreXRvMXNUVmhHdm9KUEcxZ1ZEN2d6dHp6aFYzaU93cEdVbHVEejFn?=
 =?utf-8?B?NlY3OHRHbjFldkY5Y2pDM2dzdTZqbjNWUlpiWE54aW9URFBQcXlJMmpUYmRN?=
 =?utf-8?B?NWhDNy9ES0pnWEV3UjdRb01QcWE1LzlnclNoMzQ3WjVpdHllUGpwd1RzdC9z?=
 =?utf-8?B?dzh0T3VwejJuQW5JYzEzcldOT1FIditmbG00YjBSang5WTBWaE9lWTcwNDdy?=
 =?utf-8?B?ZEdCTWVWRmVML2VUWGpFdlE3SjBjMHJEOXpxQUtWU2J1ckFNcG9sMDd4S3lL?=
 =?utf-8?B?ME9wQjdjeGhQS2J5WTdyeVRRQ0xReTBVOUtXRUsvMVFlZHhIVEZXdm1Sd3Yw?=
 =?utf-8?B?MGRXa0tFYTFkM2N4YVFUVVhDcy8zOUl1K0FiQjVYR1J0Ni9kRFh4STFJS3ov?=
 =?utf-8?B?eHdYSlFvYmdKNmZQT3VKUE9zRU1IYjV5em5JcTdVN2NPNWVvb1pNdTVZY0E2?=
 =?utf-8?B?WUN3WGFlL0lHcWVsc0o0Q2lrUWlLTU8vVmxHMmh4enNZU3gxRm91QUdEOVNi?=
 =?utf-8?B?WnFQeW5GNGhNSEFjcFo0NVJHcDZiRjd1ek82V1FLYWcvUXYwSk9lUHZXSEZY?=
 =?utf-8?B?emVQNjZEOWg2YW94OFAvTkwxejhSdW9SVjdTSWEwcXNEL3QyTGF2ZE1PSmVr?=
 =?utf-8?B?TDJsekZaWXorczBSeUM3eXNWYVhSYW5PdzNWaGdBVzBxdkorZmtlWllLT1Ro?=
 =?utf-8?B?QjFEV3M5QmZJL3RoVm1kRW5RczBYZE1yMnFrbDFYQS90bytpVmZ4S0treDJq?=
 =?utf-8?B?R014YUhQU3ZlcWsyWGV0UGtXSXovR1d0TVpiTm42YmNxUFJyTmVEZ3FhV0Fo?=
 =?utf-8?B?TXNTOGZlZVkxbHdibllyQW9lTnpXVGRlTXBHcjRRUkYzS3JpVVVGa1ZMSkVX?=
 =?utf-8?B?WXZ1WXoxcGg2SlFZUVJjK0thK3hXWFdTUklySWFGUHdxbXBaSlg2Wno2U0Nm?=
 =?utf-8?B?d1dDRGVsOEJnRjJDeTNDdlJKVXdtdVJFbUNnUFdDTXdFOWJvbVAzMU5VVERh?=
 =?utf-8?B?eUpyWXIxSjZjbDl6OUFMdGV2OTVDQXNMRy9ReXpmejVzSGc1RkFvSU55dHQw?=
 =?utf-8?B?elNjMW1Bdy9oY0Z4UUh4aGpDYWMxc25LVFhEdnRUZit1d3hSa2RRQlpDVmNn?=
 =?utf-8?B?TFJyRUp1cGVhekdHOGgxVkpYNjJuS1JPeTBXejNKZklRVnFBaXlZcXUvbEVP?=
 =?utf-8?B?V3JxRUE4QXZqMXNXN1dOZWtjYzFqb2RaMWJhaWs5YVlPdzZlYURPdWYrNXFV?=
 =?utf-8?B?NUlyMXhWeDh3MGpPUzhRaHkvL2J1ZTlQYjJBeUlqSVJENlV0cTJmdy9xZzNu?=
 =?utf-8?B?R0haOE9jdU4wN0lmQWNrcm5ta1RHOGtuay9HYTU2YkpRVHpYNGE1T3dtZk40?=
 =?utf-8?B?RUlCKzlkdGNHemxoZG5iOUVCd0laQlBhMTBTbnh0NVZEalJEVEc1MkgyampL?=
 =?utf-8?B?eEw0bFM4S25PQUgzN3BsSFlRbTNmTzV0RnBPVVpHQ25DdFlDOGpkNUNReDRt?=
 =?utf-8?B?TlJ6by9HemZvc09icU5iVkNwRmZSSkprOGRnT3JZOElQR0xHQ0UxMGFJZ0ZH?=
 =?utf-8?B?aWQxTDliRWo0dFBzTmJ6SnB6NkRTdDExbjl0cHFrSDBleEg3bitPNGNsZXYy?=
 =?utf-8?Q?LzYXm2UzJgOKZrvw22UyeaU=3D?=
X-OriginatorOrg: virtuozzo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 335ad032-8c13-42b0-d944-08d9caa4aaf6
X-MS-Exchange-CrossTenant-AuthSource: AM9PR08MB6241.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Dec 2021 08:24:44.2480
 (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: Od7vNk/x8AC4qbmW8wVG3tA/RvTYT8LJOtMbyZ5GCZZMdTfLO5d3QVaC2p9cLBNkVxCoVIqWoN6S0hG+tw23ww==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB2964
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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

Currently nfs4 use locks_lock_inode_wait() function which is blocked
for such requests. To handle them correctly FL_SLEEP flag should be
temporarily reset before executing the locks_lock_inode_wait() function.

Additionally block flag is forced to set, to translate blocking lock to
remote nfs server, expecting it supports async processing of the blocking
locks too.

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

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ee3bc79f6ca3..9b1380c4223c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7094,7 +7094,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f
 			recovery_type == NFS_LOCK_NEW ? GFP_KERNEL : GFP_NOFS);
 	if (data == NULL)
 		return -ENOMEM;
-	if (IS_SETLKW(cmd))
+	if (IS_SETLKW(cmd) || (fl->fl_flags & FL_SLEEP))
 		data->arg.block = 1;
 	nfs4_init_sequence(&data->arg.seq_args, &data->res.seq_res, 1,
 				recovery_type > NFS_LOCK_NEW);
@@ -7200,6 +7200,9 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock
 	int status;
 
 	request->fl_flags |= FL_ACCESS;
+	if (((fl_flags & FL_SLEEP_POSIX) == FL_SLEEP_POSIX) && IS_SETLK(cmd))
+		request->fl_flags &= ~FL_SLEEP;
+
 	status = locks_lock_inode_wait(state->inode, request);
 	if (status < 0)
 		goto out;
-- 
2.25.1