From patchwork Tue Oct 23 22:43:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 10653853 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C78B513A4 for ; Tue, 23 Oct 2018 22:45:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA33729FA5 for ; Tue, 23 Oct 2018 22:45:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B4E529FBD; Tue, 23 Oct 2018 22:45:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E27529FA5 for ; Tue, 23 Oct 2018 22:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728967AbeJXHLC (ORCPT ); Wed, 24 Oct 2018 03:11:02 -0400 Received: from mx2.suse.de ([195.135.220.15]:36228 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725787AbeJXHLC (ORCPT ); Wed, 24 Oct 2018 03:11:02 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 012D5AEAD; Tue, 23 Oct 2018 22:45:35 +0000 (UTC) From: NeilBrown To: Jeff Layton , Alexander Viro Date: Wed, 24 Oct 2018 09:43:54 +1100 Subject: [PATCH 0/9 v3] locks: avoid thundering-herd wake-ups Cc: "J. Bruce Fields" , Martin Wilck , linux-fsdevel@vger.kernel.org, Frank Filz , linux-kernel@vger.kernel.org Message-ID: <154033435272.29542.13985568983074440924.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This took longer that I had wanted, due to various reasons - sorry. And I'm now posting it in a merge window, which is not ideal. I don't expect it to be included in this merge window and I won't be at all impatient for review, but I didn't want to delay it further. Testing found some problems, particularly the need to use locks_copy_lock in NFS. And there was a small thinko in there that effectively removed all the speed gains :-( But this version: - shows excellent scalability with lots of threads on lots of CPUs contending on a single file - avoids the problems that Bruce found - seems to work. Thanks, NeilBrown Signed-off-by: Jeff Layton --- NeilBrown (9): fs/locks: rename some lists and pointers. fs/locks: split out __locks_wake_up_blocks(). NFS: use locks_copy_lock() to copy locks. fs/locks: allow a lock request to block other requests. fs/locks: always delete_block after waiting. fs/locks: change all *_conflict() functions to return bool. fs/locks: create a tree of dependent requests. locks: merge posix_unblock_lock() and locks_delete_block() VFS: locks: remove unnecessary white space. fs/cifs/file.c | 4 - fs/lockd/svclock.c | 2 fs/locks.c | 231 ++++++++++++++++++++++----------------- fs/nfs/nfs4proc.c | 6 + fs/nfsd/nfs4state.c | 6 + include/linux/fs.h | 11 +- include/trace/events/filelock.h | 16 +-- 7 files changed, 153 insertions(+), 123 deletions(-) -- Signature