From mboxrd@z Thu Jan 1 00:00:00 1970 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 0EAD8E95A90 for ; Sun, 8 Oct 2023 21:59:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92A236B00DA; Sun, 8 Oct 2023 17:59:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8DA336B0146; Sun, 8 Oct 2023 17:59:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C8DC6B0193; Sun, 8 Oct 2023 17:59:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6DE7C6B00DA for ; Sun, 8 Oct 2023 17:59:36 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 348D6401AD for ; Sun, 8 Oct 2023 21:59:36 +0000 (UTC) X-FDA: 81323661552.10.CC9159A Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com [209.85.161.45]) by imf13.hostedemail.com (Postfix) with ESMTP id 6E31D20009 for ; Sun, 8 Oct 2023 21:59:34 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b="Ay9/OXm6"; spf=pass (imf13.hostedemail.com: domain of david@fromorbit.com designates 209.85.161.45 as permitted sender) smtp.mailfrom=david@fromorbit.com; dmarc=pass (policy=quarantine) header.from=fromorbit.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696802374; a=rsa-sha256; cv=none; b=4f2uPbgejCK6gFwk0PtamgsYZMt/NIAqlh/bKlYhAUqfS84KLqhybbtx1ap6jVDVeRtkYb H9Ejm01D3a15xa646v57hhgRPCZ6ZBSr/i9vpzJv/8SkHA1fNFE4W5NUee17krfOQGagEj FO2aPR5RbWAx4YhKhJ6ldVxcni0m6mg= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b="Ay9/OXm6"; spf=pass (imf13.hostedemail.com: domain of david@fromorbit.com designates 209.85.161.45 as permitted sender) smtp.mailfrom=david@fromorbit.com; dmarc=pass (policy=quarantine) header.from=fromorbit.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696802374; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RHmdmQkdVjsJr88jt1p+1Se8MuMGD/JR3QvlSJrhIZw=; b=jAulUyxptXyQyyYWIRHJFqZFtMKxaUOsvS/hgZhD7zb6o/8dmyPuBtbPR/4D3fg05RMh8r OaRTSzLoxqveyFa1VH8WEJ+JR/Yh/pDKffjOmBUv4qn4dWGV+pJ71SvE9TCh0w7YdmB3NF QObAzADzUoHZPhTg0SzF5vZsJ+eE8kA= Received: by mail-oo1-f45.google.com with SMTP id 006d021491bc7-57bab4e9e1aso2421411eaf.3 for ; Sun, 08 Oct 2023 14:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20230601.gappssmtp.com; s=20230601; t=1696802373; x=1697407173; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=RHmdmQkdVjsJr88jt1p+1Se8MuMGD/JR3QvlSJrhIZw=; b=Ay9/OXm650qjGMat199FvI9j+4whiXcEmemaNbgYlinnI4QZ+zXyZbkpd0/BppmhFa wgOpZKY7FOurpkIoijKw5mBucLhfGE99PYoey0cv9c96uDZWobPkKXJKtAfSXtCnWtEE aOI/7R4GK6GGIi44/pnQ8FdL6KNt0cODWfPZXXHr9cCqSKD5hItGKP1A4JIG86PK/xDO /ypn0WUH7LbJxRckwM63Fb0iFXGtOLVDzxVUP6QQJvUATlyNt3wiXFuwLJJZoiyGGFFY ttxexCLvv8VS8OtZ095AkjNm7ESdRJDdKzyDRCZ3BJMJm5RTFh9V8Vv+AHE9GKleL8zF E6Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696802373; x=1697407173; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=RHmdmQkdVjsJr88jt1p+1Se8MuMGD/JR3QvlSJrhIZw=; b=Gd4nyEW26rnGcAE0Qsrx4ykcamfIifFgFBsFHT93RG0eF//uW3qIi6kwfwG5GCusxt wm2UiJ2YvryMJZg6jRZedmMlSbji/eUz75oamtMnK2QO6t1qETs7XOh4Jy4UufcROy0b tY1Mw7TruGSeli6uMz581S+PYsHS/0p+YGQMDhZXf84N8jCFIZ3iBNjNE5kJ0vPkOEdy UOfeLcnHfqNpewyHNUyKYPVCHoaZ/AVZ15PIokBrX7VmSlOC9Tw0gxnWto0gyyPuLA72 BrfHINLUJFU/YtuFaZUCI0sr6zscOT61PJqhvn/CmgyYtqLl+LShWtihowMvARhjpMMa XKpw== X-Gm-Message-State: AOJu0YyR4/fzhYot4Z1vM0E9UIDtmQWtODUIjsTJ7yrK/wxaGirUiFQR tGnX7EictB9JTp93KPDqHE962Q== X-Google-Smtp-Source: AGHT+IGXKMISVyHxuVm+vG9Pt+kBBJaOZcAMf0U1UZVqmJe4rkXuoORfl4tuGE7G0+IUE8CQxCFomg== X-Received: by 2002:a05:6358:52c2:b0:143:1063:d1ed with SMTP id z2-20020a05635852c200b001431063d1edmr14645362rwz.26.1696802373402; Sun, 08 Oct 2023 14:59:33 -0700 (PDT) Received: from dread.disaster.area (pa49-180-20-59.pa.nsw.optusnet.com.au. [49.180.20.59]) by smtp.gmail.com with ESMTPSA id s15-20020a17090a5d0f00b00263cca08d95sm8772070pji.55.2023.10.08.14.59.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 14:59:32 -0700 (PDT) Received: from dave by dread.disaster.area with local (Exim 4.96) (envelope-from ) id 1qpboA-00BGGw-1Q; Mon, 09 Oct 2023 08:59:30 +1100 Date: Mon, 9 Oct 2023 08:59:30 +1100 From: Dave Chinner To: "Matthew Wilcox (Oracle)" Cc: Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Chandan Babu R , "Darrick J . Wong" , linux-xfs@vger.kernel.org, Mateusz Guzik Subject: Re: [PATCH v2 3/5] xfs: Replace xfs_isilocked with xfs_assert_locked Message-ID: References: <20231007203543.1377452-1-willy@infradead.org> <20231007203543.1377452-4-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231007203543.1377452-4-willy@infradead.org> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 6E31D20009 X-Stat-Signature: d85g3bgnh8gwqcbzpqdynibcsp7ip9i1 X-Rspam-User: X-HE-Tag: 1696802374-258534 X-HE-Meta: U2FsdGVkX19IeD89NXSjt2uuak5kOVCstTIiOZNfy3GQZaM1sHDzFmHXolt5szy1rfVIGwxEgtnWugtCY7w03gAUsz4M5wH47BRbd0MqQ7E5qtbBCcs0DvtxUZI9uxmjmZL4p6kKQtwuIiCEKI9hIGfa7macq2hHHsiy5wGzjL3JPOZX0CpoajJlg9NC7v2klDRjCK6QV1/9u9RQzKX/ZOgNcQ9zV3G1xBSMtVnO56WQsXeO+AYxPRBUiIfsQAMD+smXypKyXQcY28gP71AaOnfA9jpsKd4vL/azGcq6QhcOG3z98GXWscybWQGG1uOwrYvEfHxOUUxpI2RwhFzGjIU3Iya+xtv9lMjqbJpIAdnY1eBCBVqzcp/uzX0VhvIxOPl0oZiuPR1cW6b2SZLuRm9maabBNzAs12BJOOtPkYNA+Ve/zRg3YEZXK2UIbl60HFYgaHuyuXaEPz3kld+/jJ8eUFQUn/mDjYaNMhmhc1tb0iLou0ExBFJLkb427oElCrTZG6MdD/1bmLU1APRksBG41PZskc3kFGDrmok241Yn5K6rrPZ+u15LBsVxEU0jghLZ+9ROKPR4zU93VX6hPwlYz/7M/5N+ugf/XQOqnxtOtm4VhrMQYLWKLSImMC1VGaJsR1N/X7GZiuyhUvefclNjuq8xCy/whEXgKH/mb7/33donaGszwJYt0mtQlsQjuytKVfbCthX+vbFOTiN9rori8UOMe0OsjuSKxitrKu1vd9hoFkwilUtQy6SS+45vBga6JjG6DD3eRZtsbLqfb+T1igSKMmDdbUeurJ3gaUKfFTUIR70X21GtF2XugLnD+3GrGEaw5FoGnyWm4ui7blMgB84tqAf4rkal/11twL0Lu/0TlNHMJ8G/AcPXRiQ81SIUqh83TWMfAr5AUcB6uoeFcFIJMI8fkdt2dd0bCdTryjt1z9FuKzCQ6hFf2phV87YiaONOTbQ0amdePM4 hWTsiOyQ nEtu86ZcDWfO5/2NZT8GbSFz3TEdWjiXhffG9eMsphcrhd2C64naWKAykpzp3C8RHdA8t9Q+2Cn8SezFBnrZpzYbp+jld/Y1J7byl77WbhRf9GNeANMxk9th6JO070EIFF1XPv+w1Hr0XR7QlzgYlwmcj7gKNp5Sahdtsv9zWkVS0UbxeEb8HUAFXXtHm3KySdHyEvcn/WPR28CtSuevs7BsmuQm5mKgYuKJM5qeNOpCebRx52LS1ulgKXEFZIXj3YvexveBpL5gt/ckM2Qt0VG6EfVJjmQZjMvUITbPm60Lqdna2cevT1u95vNDHK84K5WfWGEWlcTy2B2SwJp41zoL8ydba+288syRR80XNM3LWq5twqVfwUw80jd0dsiyaMcQTjBNpWPk34Q4eZjlRUIeZVsWn3vRJEuhZA1ouPO7duj3XxLYNL6F1JK7MhyDiQ8HfikfMSfOEGUu/+kgMySPa7B5Y+icS53lbMprA8Y7Ok9NoCVOlPmfEFaCvFXLHsGIGYaU8nwKYWH0F7caWHdAP7kmubXDAEVb4DfoBWIt2Hj8= 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: On Sat, Oct 07, 2023 at 09:35:41PM +0100, Matthew Wilcox (Oracle) wrote: > To use the new rwsem_assert_held()/rwsem_assert_held_write(), we can't > use the existing ASSERT macro. > > xfs_assert_ilocked(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL) checks both the > IOLOCK and the ILOCK are held for write. xfs_isilocked() only checked > that the ILOCK was held for write. > > xfs_assert_ilocked() is always on, even if DEBUG or XFS_WARN aren't > defined. It's a cheap check, so I don't think it's worth defining > it away. > > Signed-off-by: Matthew Wilcox (Oracle) > --- ...... > -bool > -xfs_isilocked( > +void > +xfs_assert_ilocked( > struct xfs_inode *ip, > uint lock_flags) > { > - if (lock_flags & (XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)) { > - if (!(lock_flags & XFS_ILOCK_SHARED)) > - return !!ip->i_lock.mr_writer; > - return rwsem_is_locked(&ip->i_lock.mr_lock); > - } > - > - if (lock_flags & (XFS_MMAPLOCK_EXCL|XFS_MMAPLOCK_SHARED)) { > - return __xfs_rwsem_islocked(&VFS_I(ip)->i_mapping->invalidate_lock, > - (lock_flags & XFS_MMAPLOCK_SHARED)); > - } > - > - if (lock_flags & (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED)) { > - return __xfs_rwsem_islocked(&VFS_I(ip)->i_rwsem, > - (lock_flags & XFS_IOLOCK_SHARED)); > - } > - > - ASSERT(0); > - return false; > + if (lock_flags & XFS_ILOCK_SHARED) > + rwsem_assert_held(&ip->i_lock.mr_lock); > + else if (lock_flags & XFS_ILOCK_EXCL) > + BUG_ON(!ip->i_lock.mr_writer); ASSERT(!ip->i_lock.mr_writer); Otherwise OK. -Dave. -- Dave Chinner david@fromorbit.com