From patchwork Sat Oct 7 20:35:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13412477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77513E95A6F for ; Sat, 7 Oct 2023 20:36:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 324CF8D0012; Sat, 7 Oct 2023 16:36:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 215AA8D0014; Sat, 7 Oct 2023 16:36:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 068F38D0012; Sat, 7 Oct 2023 16:36:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E71A58D0001 for ; Sat, 7 Oct 2023 16:36:02 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B9DAB1602ED for ; Sat, 7 Oct 2023 20:36:02 +0000 (UTC) X-FDA: 81319822164.16.1A5E81C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id 38453180026 for ; Sat, 7 Oct 2023 20:36:00 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=D3iwRI4G; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696710961; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=TF/aqVn3IrPnAMqnSHzChnQi0apaIvuOdxt0Uorvv1E=; b=aB+RpQHgMaAFMLZyqamKm8s4amABGjtXTyAkBGPjyw4gngv5JCPCGdttC9WKHsm+Bg3+Xm VssfcPYk3BmvdDLSIuj/bs/zAjEfT9LMil1PSCYUX9Q5s7bLV7OxlL6Xjmz65YQsTlw+oG m3wF/pv/FqD+UcMok+dLuN1CC3f2P9I= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=D3iwRI4G; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696710961; a=rsa-sha256; cv=none; b=1AlAyzBhZ3hiSgpK6tRA5QDE7ZnRJeOOKk7qj4UUgob1lelwOdX/HAFgx4f01FjjovjC0f dnd/h7GGrvbRpX1lc6CE5kKsOjDL2g2UufaiCnWtkAM1GJ41uKs2HApD6ZDT+n8+24L1uV SoF4oG1N939ebffM7T60YfEtdUcWegs= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=TF/aqVn3IrPnAMqnSHzChnQi0apaIvuOdxt0Uorvv1E=; b=D3iwRI4Gvzv9R9HV3nr9SWYP+s RdPiYvPHnG64BZK2SzCbvTwNWhcnYMlYkwGALT2aEiqtaKZnaCALWYgm0MWGHhD8oGn9kfTF9enem NetzCtD4xQREvOZ4jXL1aTsL1kWhwbRLCsutNPGYwtaujQKRGRamU/XdZL7b+i+3btAl4Nm5skEzP ccJl7S82yyWJeai2rto3f8d9OiLsOTr2b+52aFNSjCREUH4N5WFYLQTTKEuXsXa4w2ePNoq+3VNb6 hPZ6INb5AhYpZv2WUlIReGB4xllPL/lkJNpE622MtUYd/2QyD+lZ4IjBdOp7cZYtwEd1wxCoLiq2/ nmbReRHg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qpE1Y-005mL8-Eh; Sat, 07 Oct 2023 20:35:44 +0000 From: "Matthew Wilcox (Oracle)" To: Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Chandan Babu R , "Darrick J . Wong" , linux-xfs@vger.kernel.org, Mateusz Guzik Subject: [PATCH v2 0/5] Remove the XFS mrlock Date: Sat, 7 Oct 2023 21:35:38 +0100 Message-Id: <20231007203543.1377452-1-willy@infradead.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 38453180026 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: se97wopgp8z8556gjx3xr441bbxjtx8j X-HE-Tag: 1696710960-718660 X-HE-Meta: U2FsdGVkX1/s47KjhEHhCdkdWslo9rtbIjxGh77ySKuyXrTYKQ+BNwxDAJfmc73Q6j1nKdvAGEY6FdDWYQu3LVjNN0vvirrF884IE4ybLjvrCIhHdq2q20fUQoMfFpfTJvi6xBsDSBbZipY+0L9DhZ9voZ/WbM1Bm8j2OOQ1RXmGX1802tzdQQVo32huymC/QbOulEF+01gddltZEnH75jRSaLj2NbtFpyVntMYeKJm6HVUAjKTg8smB1xcoh7loQg/rlvWap1EtkyCwUgHesLEPzaVg2tZv9ajd5a/7fWLfnOBWhpb5aSg8WyBDP4YP2IG0yWub+cENkmTT6sZx4k60Xe8bAeeWy2rVXJN15oMwzAnXkf3tvOu0kOAdE8AsEh0yRdr07q+VZqH8i82u2g2VI5IqX+xX73S/zZLeR3F5Nb0roz3UcMDt1sdTha+FpQdf/kGM6qAawMXWjXTbPXesxQTWJy8jFNa0uwv30MjdrFVd76zXyT5YHZ8djNNAyG6+cSmqOKPhCyJlEWeT1xFR8kUi4GO8T/Oe45VadFk5uYbJghpziHPuz9LEuB+5IRJRmC32K4Q1OnGJHyR1z3kM7wDovPYp/35G+nEGdVtMWA8tTq42gjY528IS7PIfAk3XrJo4/AKY6ucmsd3Vhxhw+nbD3nQckyD9IMZrJVFMhUMDViojVMaOikfcD29KzHF9k7KJDy0nzDsh4xtSRWiyQ+t6Sq1/fo4Rjg6FR4QALEtahgBEv6zO980j5z37RrrtB97nriYUIQWDw/W1nmoffDc4vyI8lGKUtS3uSprARqNB9tt8Ti91Who0nFbHE/S8cShQKX6HSkUDlpgZqAK1HKmJ5K5+DCejBq/ltmZdaH/gh1NIYLwNRnOhOpyREXE5Qj2iMo2GL6BOBHTE+x5PAJhaQXzAJDi7u2ianZEB0wXNTSTQHeUfC4iWSQocSGMqwVD3YRogx3X7U9B r0apch14 tmIHRvLjDFo7m6AZ0DFZVxLjyztiE0liXALu8GCCtl0fWfe9CGC//0K5J3cYwRyiVrCcW2JsggL85454hO9vWCG274j8qVVKKDe08He6RjvZ3V7UPvPM9yCmaIQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: XFS has an mrlock wrapper around the rwsem which adds only the functionality of knowing whether the rwsem is currently held in read or write mode. Both regular rwsems and rt-rwsems know this, they just don't expose it as an API. By adding that, we can remove the XFS mrlock as well as improving the debug assertions for the mmap_lock when lockdep is disabled. v2: Add rwsem_assert_held() and rwsem_assert_held_write() instead of augmenting the existing rwsem_is_locked() with rwsem_is_write_locked(). There's also an __rwsem_assert_held() and __rwsem_assert_held_write() for the benefit of XFS when it's in a context where lockdep doesn't know what's going on. It's still an improvement, so I hope those who are looking for perfection can accept a mere improvement. We can do more to replace uses of rwsem_is_locked(), and I have a few of those in my tree, but let's focus on these three use cases for now and we can trickle in other improvements through other maintainers after 6.7. I'm sympathetic to "this will warn twice and dump much the same information if you have lockdep enabled". Perhaps somebody has a suggestion for not doing that? Matthew Wilcox (Oracle) (5): locking: Add rwsem_assert_held() and rwsem_assert_held_write() mm: Use rwsem assertion macros for mmap_lock xfs: Replace xfs_isilocked with xfs_assert_locked xfs: Remove mrlock wrapper fs: Add inode_assert_locked() and inode_assert_locked_excl() fs/attr.c | 2 +- fs/namei.c | 6 +-- fs/xfs/libxfs/xfs_attr.c | 2 +- fs/xfs/libxfs/xfs_attr_remote.c | 2 +- fs/xfs/libxfs/xfs_bmap.c | 19 ++++---- fs/xfs/libxfs/xfs_defer.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.c | 2 +- fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- fs/xfs/libxfs/xfs_trans_inode.c | 6 +-- fs/xfs/mrlock.h | 78 ------------------------------ fs/xfs/scrub/readdir.c | 4 +- fs/xfs/xfs_attr_list.c | 2 +- fs/xfs/xfs_bmap_util.c | 10 ++-- fs/xfs/xfs_dir2_readdir.c | 2 +- fs/xfs/xfs_dquot.c | 4 +- fs/xfs/xfs_file.c | 4 +- fs/xfs/xfs_inode.c | 86 ++++++++++++--------------------- fs/xfs/xfs_inode.h | 4 +- fs/xfs/xfs_inode_item.c | 4 +- fs/xfs/xfs_iops.c | 7 ++- fs/xfs/xfs_linux.h | 2 +- fs/xfs/xfs_qm.c | 10 ++-- fs/xfs/xfs_reflink.c | 2 +- fs/xfs/xfs_rtalloc.c | 4 +- fs/xfs/xfs_super.c | 4 +- fs/xfs/xfs_symlink.c | 2 +- fs/xfs/xfs_trans_dquot.c | 2 +- include/linux/fs.h | 10 ++++ include/linux/mmap_lock.h | 10 ++-- include/linux/rwbase_rt.h | 9 +++- include/linux/rwsem.h | 42 ++++++++++++++-- 31 files changed, 142 insertions(+), 203 deletions(-) delete mode 100644 fs/xfs/mrlock.h