From patchwork Thu Feb 27 20:36:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11409619 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F1EA138D for ; Thu, 27 Feb 2020 20:36:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2AA92469C for ; Thu, 27 Feb 2020 20:36:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="K9wunsri" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726793AbgB0Ugn (ORCPT ); Thu, 27 Feb 2020 15:36:43 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:39066 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729390AbgB0Ugn (ORCPT ); Thu, 27 Feb 2020 15:36:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582835802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y6MT4UtOBzFR1h4DyNC8cqcoSl937BEDZoWb49mSsj0=; b=K9wunsrizH+ycGUg/+nPsrUk5Mjv5ALLJhgTSPlBpA8uD/h/J5Dzachh3UQCyvUFCuPBH2 hF6N3nxDaosuLISEqoRDQj53ATxgSVwTOmK/qGHX9hRSWdqw41W5yXZnigHcTSrlGCN4/0 UOTSBHdKbDSBy7Wi3glf0dvdJ1f4XVI= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-220-6FZUBi70NDO0_ihROFMVng-1; Thu, 27 Feb 2020 15:36:40 -0500 X-MC-Unique: 6FZUBi70NDO0_ihROFMVng-1 Received: by mail-wr1-f71.google.com with SMTP id y28so315131wrd.23 for ; Thu, 27 Feb 2020 12:36:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y6MT4UtOBzFR1h4DyNC8cqcoSl937BEDZoWb49mSsj0=; b=TqWk4vGZwFoN8YDJXg1co+bP/9B0IoQPVPs6IhIlam3OkVJReOhl6uO3IBgl05Uknf I3PdvhxUgQhBn5cLxt6AG1rU/jHoQVSaWouM5Gx0VxU9wLNNUNzhuJEo5tbpeF3iD/0o VJ0gCYFrHb0GYywcq/9Uv2xva/UHfP5OW5iuntbS8Ayu3sUgrknwgrDxCnw5ynmCvl8e hD8dbGWhhpRye+VMDAsFtKxVx1S69Rq/Cev9E8L2lYatcLpXSQzAv8mFARy0LpDcRwC2 zhI4QEhbb61kEPUKKaXNPjI5PawJnXCz7/RMrmJCk6M5UYEGTxMOrbifD590X8OxcSx7 p2CA== X-Gm-Message-State: APjAAAWkCD6ZimTsDf+zt/ydL0BcM4rkUGxZUQFK0pqj0I0i/esAFUeX n3R+P2zy3s500cCxfNCGJEPshrlP8p5AaWp8OYMJACsFSHZKv7HiyrUlIBqXXvxhedIR3QP2HcJ o18sX29eoq3zX5aAsXivI X-Received: by 2002:a7b:c4c3:: with SMTP id g3mr513811wmk.131.1582835798827; Thu, 27 Feb 2020 12:36:38 -0800 (PST) X-Google-Smtp-Source: APXvYqwqxtw8e/NvxgUmum3XW3nheraGvVkRcfQ3kTEeX3xyF3/SGw0OyOPkqzPqqG7M4F/y7uTq1w== X-Received: by 2002:a7b:c4c3:: with SMTP id g3mr513798wmk.131.1582835798562; Thu, 27 Feb 2020 12:36:38 -0800 (PST) Received: from localhost.localdomain (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id e11sm9217157wrm.80.2020.02.27.12.36.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 12:36:38 -0800 (PST) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v6 1/4] xfs: Refactor xfs_isilocked() Date: Thu, 27 Feb 2020 21:36:33 +0100 Message-Id: <20200227203636.317790-2-preichl@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200227203636.317790-1-preichl@redhat.com> References: <20200227203636.317790-1-preichl@redhat.com> MIME-Version: 1.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Refactor xfs_isilocked() to use newly introduced __xfs_rwsem_islocked(). __xfs_rwsem_islocked() is a helper function which encapsulates checking state of rw_semaphores hold by inode. Signed-off-by: Pavel Reichl Suggested-by: Dave Chinner Suggested-by: Eric Sandeen --- Changes from V5: Drop shared flag from __xfs_rwsem_islocked() fs/xfs/xfs_inode.c | 42 ++++++++++++++++++++++++++---------------- fs/xfs/xfs_inode.h | 2 +- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index c5077e6326c7..4faf7827717b 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -345,32 +345,42 @@ xfs_ilock_demote( } #if defined(DEBUG) || defined(XFS_WARN) -int +static inline bool +__xfs_rwsem_islocked( + struct rw_semaphore *rwsem, + bool excl) +{ + if (!rwsem_is_locked(rwsem)) + return false; + + if (debug_locks && excl) + return lockdep_is_held_type(rwsem, 1); + + return true; +} + +bool xfs_isilocked( - xfs_inode_t *ip, + 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_ILOCK_EXCL | XFS_ILOCK_SHARED)) { + return __xfs_rwsem_islocked(&ip->i_lock.mr_lock, + (lock_flags & XFS_ILOCK_EXCL)); } - if (lock_flags & (XFS_MMAPLOCK_EXCL|XFS_MMAPLOCK_SHARED)) { - if (!(lock_flags & XFS_MMAPLOCK_SHARED)) - return !!ip->i_mmaplock.mr_writer; - return rwsem_is_locked(&ip->i_mmaplock.mr_lock); + if (lock_flags & (XFS_MMAPLOCK_EXCL | XFS_MMAPLOCK_SHARED)) { + return __xfs_rwsem_islocked(&ip->i_mmaplock.mr_lock, + (lock_flags & XFS_MMAPLOCK_EXCL)); } - if (lock_flags & (XFS_IOLOCK_EXCL|XFS_IOLOCK_SHARED)) { - if (!(lock_flags & XFS_IOLOCK_SHARED)) - return !debug_locks || - lockdep_is_held_type(&VFS_I(ip)->i_rwsem, 0); - return rwsem_is_locked(&VFS_I(ip)->i_rwsem); + if (lock_flags & (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED)) { + return __xfs_rwsem_islocked(&VFS_I(ip)->i_rwsem, + (lock_flags & XFS_IOLOCK_EXCL)); } ASSERT(0); - return 0; + return false; } #endif diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 492e53992fa9..3d7ce355407d 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -416,7 +416,7 @@ void xfs_ilock(xfs_inode_t *, uint); int xfs_ilock_nowait(xfs_inode_t *, uint); void xfs_iunlock(xfs_inode_t *, uint); void xfs_ilock_demote(xfs_inode_t *, uint); -int xfs_isilocked(xfs_inode_t *, uint); +bool xfs_isilocked(xfs_inode_t *, uint); uint xfs_ilock_data_map_shared(struct xfs_inode *); uint xfs_ilock_attr_map_shared(struct xfs_inode *); From patchwork Thu Feb 27 20:36:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11409621 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC965138D for ; Thu, 27 Feb 2020 20:36:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AE49246A0 for ; Thu, 27 Feb 2020 20:36:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hUGrUBOq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729463AbgB0Ugp (ORCPT ); Thu, 27 Feb 2020 15:36:45 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52151 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729351AbgB0Ugp (ORCPT ); Thu, 27 Feb 2020 15:36:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582835804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tq12WWJbCLJ3UGDavyT1Ia8p+H5z66yhgHqbUDK4lLE=; b=hUGrUBOqQA9nqk7mPkksSRx3kjuiPBEGlTiJLpKKqRBasOqmzk2pfTvtYVu0Saq+X//2pM Hs/7gXglwkACiJZQ5YuI7F8UJLNcxUFyzEER6stjjH0a0x4Yk7GhHkWkIvQHrkThK0qJFl 4JFOXc92D8xMGrbDg+MMeqpwaVes7Q8= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-164-2WfmJaDhNSGDJ8Mh2ajwQA-1; Thu, 27 Feb 2020 15:36:41 -0500 X-MC-Unique: 2WfmJaDhNSGDJ8Mh2ajwQA-1 Received: by mail-wr1-f72.google.com with SMTP id w18so342135wro.2 for ; Thu, 27 Feb 2020 12:36:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tq12WWJbCLJ3UGDavyT1Ia8p+H5z66yhgHqbUDK4lLE=; b=M65ywVbsalXX2z3nBrbDws5cAw4A9sSWcmXB3tC8IRrKVsu7yZ9C6jIqWKsbu3bPtR qPcVzacQV5W2ctLobIR8BgK2piW/hIj/zOXeHAjwwe0vLXjAJTw9Io4XgY7zU7AY5bZ8 QwN3gmO5/0vs6qSTvRYaLFH/x3dxrM7bLYwUHbPcjt5MXpVN9eomCAYzXjffeb3YIUSG Wfi+BPmXg9CI64h9FRoZ3pNPjMCDntObjWORVC5Edpn9yYVr3Z2VkWbNIlfKYx0tA+2H YC9DeJO27a1/JLMCCzHdRoZ6AK8DRuiTZ13x/pgHMuDRNzJDci6yTgSoFWeGA7QCuywl 52MA== X-Gm-Message-State: APjAAAU4ZmEZG0+GAU5r6S9hgTyUv561+V6VeXuS3KwHsmA9QB9zHTi2 DzPSIjgn66upDK79YqG6MJW6spF4XeC2MOgMH6Eu2bXZgN5sznS/fDWygBAg1FXpF13qPAmiAV5 PuyFkaYxPqP1N2NDZP6m3 X-Received: by 2002:a7b:c850:: with SMTP id c16mr593343wml.68.1582835800159; Thu, 27 Feb 2020 12:36:40 -0800 (PST) X-Google-Smtp-Source: APXvYqw65mRByJKkP74yKC5zCVbXynJ4gs86ZpmM/kljQXD+gHPpWtYrR6oBbuyIJ9vAsgo6us+MEg== X-Received: by 2002:a7b:c850:: with SMTP id c16mr593325wml.68.1582835799882; Thu, 27 Feb 2020 12:36:39 -0800 (PST) Received: from localhost.localdomain (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id e11sm9217157wrm.80.2020.02.27.12.36.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 12:36:39 -0800 (PST) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v6 2/4] xfs: clean up whitespace in xfs_isilocked() calls Date: Thu, 27 Feb 2020 21:36:34 +0100 Message-Id: <20200227203636.317790-3-preichl@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200227203636.317790-1-preichl@redhat.com> References: <20200227203636.317790-1-preichl@redhat.com> MIME-Version: 1.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Make whitespace follow the same pattern in all xfs_isilocked() calls. Signed-off-by: Pavel Reichl Reviewed-by: Dave Chinner Reviewed-by: Christoph Hellwig --- Changes from V5: None fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/xfs_file.c | 3 ++- fs/xfs/xfs_inode.c | 6 +++--- fs/xfs/xfs_qm.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 9a6d7a84689a..bc2be29193aa 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -3906,7 +3906,7 @@ xfs_bmapi_read( ASSERT(*nmap >= 1); ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK|XFS_BMAPI_ENTIRE| XFS_BMAPI_COWFORK))); - ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED|XFS_ILOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ip, whichfork)) || XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) { diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index b8a4a3f29b36..6b65572bdb21 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -770,7 +770,8 @@ xfs_break_layouts( bool retry; int error; - ASSERT(xfs_isilocked(XFS_I(inode), XFS_IOLOCK_SHARED|XFS_IOLOCK_EXCL)); + ASSERT(xfs_isilocked(XFS_I(inode), + XFS_IOLOCK_SHARED | XFS_IOLOCK_EXCL)); do { retry = false; diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 4faf7827717b..e778739adbf8 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2816,7 +2816,7 @@ static void xfs_iunpin( struct xfs_inode *ip) { - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)); trace_xfs_inode_unpin_nowait(ip, _RET_IP_); @@ -3680,7 +3680,7 @@ xfs_iflush( XFS_STATS_INC(mp, xs_iflush_count); - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)); ASSERT(xfs_isiflocked(ip)); ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE || ip->i_d.di_nextents > XFS_IFORK_MAXEXT(ip, XFS_DATA_FORK)); @@ -3812,7 +3812,7 @@ xfs_iflush_int( struct xfs_dinode *dip; struct xfs_mount *mp = ip->i_mount; - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)); ASSERT(xfs_isiflocked(ip)); ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE || ip->i_d.di_nextents > XFS_IFORK_MAXEXT(ip, XFS_DATA_FORK)); diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 0b0909657bad..d2896925b5ca 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -1802,7 +1802,7 @@ xfs_qm_vop_chown_reserve( int error; - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)); ASSERT(XFS_IS_QUOTA_RUNNING(mp)); delblks = ip->i_delayed_blks; From patchwork Thu Feb 27 20:36:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11409623 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5CF2138D for ; Thu, 27 Feb 2020 20:36:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A566D246A0 for ; Thu, 27 Feb 2020 20:36:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WiNOJhmq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729498AbgB0Ugq (ORCPT ); Thu, 27 Feb 2020 15:36:46 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39790 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729409AbgB0Ugp (ORCPT ); Thu, 27 Feb 2020 15:36:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582835804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6yQTu420JW+laaVKh8Pijf952p5iuFmH4hmdQZVSDyg=; b=WiNOJhmqptAXOiaVnJgx5Wcf7FMyZG0Vm2Qyg99P06d6ATHotkZckKWTKFetcrdmG7Liiw Y+olbZ2/kbqaAzw4O5GNnmNS1iM8L0EfUqxzbgIm5Ew5FB9tI163yb3r9Pe2U4NzjStY8x Coq9xPizpqVptsDMqvn882QdvV14PaE= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-Qmtk1CfPOqaoPNQy75FVpg-1; Thu, 27 Feb 2020 15:36:42 -0500 X-MC-Unique: Qmtk1CfPOqaoPNQy75FVpg-1 Received: by mail-wr1-f72.google.com with SMTP id m13so339738wrw.3 for ; Thu, 27 Feb 2020 12:36:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6yQTu420JW+laaVKh8Pijf952p5iuFmH4hmdQZVSDyg=; b=thwwjhL68w1zfEVS73fa/NqnhtNPo/lOJ0mHRmipWPoKX1LoO2WHZ0jGzS2YhiKGSq g4XVWH6P6/R4UneHPH/znwq9C2GM0ChVFRReO6rAwIVUxzNnSqErRKJDANSVYOvxvyLz ZvArIyooP/pDB0CLSaCCsPE68Yay/37A9SLuDJBvOjLR5d9qshrtzIC4a6/dSBrPnIxt jv2/7OdCYHUvw9ab1beSpBus5TkptYA9dfVlC9amPisOBsYQyy7lNE+qsZsungJZzcmx 3oVpIvY3NT41LNKu6ySEoC/de4+96Cm3IL7tg3dHZcM43O/9HRwISQwjFTXruXi36Wib NMkg== X-Gm-Message-State: APjAAAWJ1u4V9U/QXWunUANkoQ+zJe/NBNK0p4F2traBp/ZSXvEenTvT xiTEly1ff1a9RNHUmkr93aKA8tns3T0ajgC5LSDzv/R1tRWIA+5LntvB+k8xaWJZIIcWMCQg0SI WXsVzQtyU+iQXIfN0tbfV X-Received: by 2002:a1c:25c5:: with SMTP id l188mr560105wml.105.1582835801151; Thu, 27 Feb 2020 12:36:41 -0800 (PST) X-Google-Smtp-Source: APXvYqynvO3gdMuJ9B9PrM5QJsEU+xveZByZW1kE7a4KaBuFiFd0gn3hxOVqKbhB/kwvZDIittQakg== X-Received: by 2002:a1c:25c5:: with SMTP id l188mr560092wml.105.1582835800894; Thu, 27 Feb 2020 12:36:40 -0800 (PST) Received: from localhost.localdomain (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id e11sm9217157wrm.80.2020.02.27.12.36.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 12:36:40 -0800 (PST) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v6 3/4] xfs: xfs_isilocked() can only check a single lock type Date: Thu, 27 Feb 2020 21:36:35 +0100 Message-Id: <20200227203636.317790-4-preichl@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200227203636.317790-1-preichl@redhat.com> References: <20200227203636.317790-1-preichl@redhat.com> MIME-Version: 1.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org In its current form, xfs_isilocked() is only able to test one lock type at a time - ilock, iolock, or mmap lock, but combinations are not properly handled. The intent here is to check that both XFS_IOLOCK_EXCL and XFS_ILOCK_EXCL are held, so test them each separately. The commit ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents") ORed the flags together which was an error, so this patch reverts that part of the change and check the locks independently. Fixes: ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents") Reviewed-by: Eric Sandeen Reviewed-by: Dave Chinner Reviewed-by: Christoph Hellwig Suggested-by: Dave Chinner Signed-off-by: Pavel Reichl --- Changes from V5: None fs/xfs/libxfs/xfs_bmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index bc2be29193aa..c9dc94f114ed 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5829,7 +5829,8 @@ xfs_bmap_collapse_extents( if (XFS_FORCED_SHUTDOWN(mp)) return -EIO; - ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); if (!(ifp->if_flags & XFS_IFEXTENTS)) { error = xfs_iread_extents(tp, ip, whichfork); @@ -5946,7 +5947,8 @@ xfs_bmap_insert_extents( if (XFS_FORCED_SHUTDOWN(mp)) return -EIO; - ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); if (!(ifp->if_flags & XFS_IFEXTENTS)) { error = xfs_iread_extents(tp, ip, whichfork); From patchwork Thu Feb 27 20:36:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11409625 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A5341805 for ; Thu, 27 Feb 2020 20:36:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEFA8246A2 for ; Thu, 27 Feb 2020 20:36:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AQUD5Ly1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729409AbgB0Ugq (ORCPT ); Thu, 27 Feb 2020 15:36:46 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58853 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729351AbgB0Ugq (ORCPT ); Thu, 27 Feb 2020 15:36:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582835805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qXwUmFyfEVUf6Tn/A8v7+J5jfteXoZyBtLDyuFl68/c=; b=AQUD5Ly1X7401BzxyH4ipWuLHN37Lm9zrB+22F4W9ETwszLd0reB9/adMFbTDPb7SWWpmT xfW8PAbTXgvH6dRNduvLemfi7DS4iFWdkK1TfZ1Q78qP1Hx0n7DkSECt1Ve0PgynQpQkxZ M0cM0AQDhPJliBBS4w0rFCjVYyPat3Y= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-17-KjLK6UWtMdClogjtxi8NVQ-1; Thu, 27 Feb 2020 15:36:43 -0500 X-MC-Unique: KjLK6UWtMdClogjtxi8NVQ-1 Received: by mail-wr1-f71.google.com with SMTP id c6so320761wrm.18 for ; Thu, 27 Feb 2020 12:36:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qXwUmFyfEVUf6Tn/A8v7+J5jfteXoZyBtLDyuFl68/c=; b=fhdZ5DPkJ9OpapOv2BY5+E9b19hgxflV5xzyW/V+7+HDlDbkazmv9ZY26WF+l8zczM nuaaC5rYUh3F/E6+TWXCV0+B33JeJqP/IKyijKOJzYm0ePTx7k35sidnK4efGdvn+dy3 irCVPkz8I0i5YSXf0nh2OiiQVybJBu8rVIPZ/pIDAE8OKHwAS8chIYnOXr0YGzossJsC cDPgibcxJ8WFmRH7oaeVLCedTOq8AMQ/Rw0Z0FSPqLdDGsT7LDCmAmYl1N0XY8tVzks2 7tgEj0UFRSkS5ZDfFhDVFCX36HgGrg/7ynegwrUNci+kUmgvr81y9S0NRjA1emQNOWbP t0fQ== X-Gm-Message-State: APjAAAWhPrLF2IhKYYHdY1g0bVzjJyFiS/jEom4WDKRdDxlQBepTMtMw NUCigJwAiUinl1KRIPooPZIpk0sAz9qetsbkba6DhKGpsxKCPogHbow966sfX/jIkjqS+f1tSuK zN6TGf/R2H+hSgPgAGOFM X-Received: by 2002:adf:828b:: with SMTP id 11mr638739wrc.169.1582835802251; Thu, 27 Feb 2020 12:36:42 -0800 (PST) X-Google-Smtp-Source: APXvYqwLcPGvAhZZHJ2OUScGEbllIsJc8yu/9H3zIQvqPb2aNkFcAI6yjKCj5+Mobhv/+D/YkJkhtA== X-Received: by 2002:adf:828b:: with SMTP id 11mr638728wrc.169.1582835801941; Thu, 27 Feb 2020 12:36:41 -0800 (PST) Received: from localhost.localdomain (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id e11sm9217157wrm.80.2020.02.27.12.36.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 12:36:41 -0800 (PST) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v6 4/4] xfs: replace mrlock_t with rw_semaphores Date: Thu, 27 Feb 2020 21:36:36 +0100 Message-Id: <20200227203636.317790-5-preichl@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200227203636.317790-1-preichl@redhat.com> References: <20200227203636.317790-1-preichl@redhat.com> MIME-Version: 1.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Remove mrlock_t as it does not provide any extra value over rw_semaphores. Make i_lock and i_mmaplock native rw_semaphores and replace mr*() functions with native rwsem calls. Signed-off-by: Pavel Reichl Reviewed-by: Dave Chinner Reviewed-by: Christoph Hellwig --- Changes from V5: None fs/xfs/mrlock.h | 78 ---------------------------------------------- fs/xfs/xfs_inode.c | 40 +++++++++++++----------- fs/xfs/xfs_inode.h | 4 +-- fs/xfs/xfs_iops.c | 4 +-- fs/xfs/xfs_linux.h | 2 +- fs/xfs/xfs_super.c | 6 ++-- 6 files changed, 29 insertions(+), 105 deletions(-) delete mode 100644 fs/xfs/mrlock.h diff --git a/fs/xfs/mrlock.h b/fs/xfs/mrlock.h deleted file mode 100644 index 79155eec341b..000000000000 --- a/fs/xfs/mrlock.h +++ /dev/null @@ -1,78 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2000-2006 Silicon Graphics, Inc. - * All Rights Reserved. - */ -#ifndef __XFS_SUPPORT_MRLOCK_H__ -#define __XFS_SUPPORT_MRLOCK_H__ - -#include - -typedef struct { - struct rw_semaphore mr_lock; -#if defined(DEBUG) || defined(XFS_WARN) - int mr_writer; -#endif -} mrlock_t; - -#if defined(DEBUG) || defined(XFS_WARN) -#define mrinit(mrp, name) \ - do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0) -#else -#define mrinit(mrp, name) \ - do { init_rwsem(&(mrp)->mr_lock); } while (0) -#endif - -#define mrlock_init(mrp, t,n,s) mrinit(mrp, n) -#define mrfree(mrp) do { } while (0) - -static inline void mraccess_nested(mrlock_t *mrp, int subclass) -{ - down_read_nested(&mrp->mr_lock, subclass); -} - -static inline void mrupdate_nested(mrlock_t *mrp, int subclass) -{ - down_write_nested(&mrp->mr_lock, subclass); -#if defined(DEBUG) || defined(XFS_WARN) - mrp->mr_writer = 1; -#endif -} - -static inline int mrtryaccess(mrlock_t *mrp) -{ - return down_read_trylock(&mrp->mr_lock); -} - -static inline int mrtryupdate(mrlock_t *mrp) -{ - if (!down_write_trylock(&mrp->mr_lock)) - return 0; -#if defined(DEBUG) || defined(XFS_WARN) - mrp->mr_writer = 1; -#endif - return 1; -} - -static inline void mrunlock_excl(mrlock_t *mrp) -{ -#if defined(DEBUG) || defined(XFS_WARN) - mrp->mr_writer = 0; -#endif - up_write(&mrp->mr_lock); -} - -static inline void mrunlock_shared(mrlock_t *mrp) -{ - up_read(&mrp->mr_lock); -} - -static inline void mrdemote(mrlock_t *mrp) -{ -#if defined(DEBUG) || defined(XFS_WARN) - mrp->mr_writer = 0; -#endif - downgrade_write(&mrp->mr_lock); -} - -#endif /* __XFS_SUPPORT_MRLOCK_H__ */ diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index e778739adbf8..c07323e05db9 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -191,14 +191,15 @@ xfs_ilock( } if (lock_flags & XFS_MMAPLOCK_EXCL) - mrupdate_nested(&ip->i_mmaplock, XFS_MMAPLOCK_DEP(lock_flags)); + down_write_nested(&ip->i_mmaplock, + XFS_MMAPLOCK_DEP(lock_flags)); else if (lock_flags & XFS_MMAPLOCK_SHARED) - mraccess_nested(&ip->i_mmaplock, XFS_MMAPLOCK_DEP(lock_flags)); + down_read_nested(&ip->i_mmaplock, XFS_MMAPLOCK_DEP(lock_flags)); if (lock_flags & XFS_ILOCK_EXCL) - mrupdate_nested(&ip->i_lock, XFS_ILOCK_DEP(lock_flags)); + down_write_nested(&ip->i_lock, XFS_ILOCK_DEP(lock_flags)); else if (lock_flags & XFS_ILOCK_SHARED) - mraccess_nested(&ip->i_lock, XFS_ILOCK_DEP(lock_flags)); + down_read_nested(&ip->i_lock, XFS_ILOCK_DEP(lock_flags)); } /* @@ -242,27 +243,27 @@ xfs_ilock_nowait( } if (lock_flags & XFS_MMAPLOCK_EXCL) { - if (!mrtryupdate(&ip->i_mmaplock)) + if (!down_write_trylock(&ip->i_mmaplock)) goto out_undo_iolock; } else if (lock_flags & XFS_MMAPLOCK_SHARED) { - if (!mrtryaccess(&ip->i_mmaplock)) + if (!down_read_trylock(&ip->i_mmaplock)) goto out_undo_iolock; } if (lock_flags & XFS_ILOCK_EXCL) { - if (!mrtryupdate(&ip->i_lock)) + if (!down_write_trylock(&ip->i_lock)) goto out_undo_mmaplock; } else if (lock_flags & XFS_ILOCK_SHARED) { - if (!mrtryaccess(&ip->i_lock)) + if (!down_read_trylock(&ip->i_lock)) goto out_undo_mmaplock; } return 1; out_undo_mmaplock: if (lock_flags & XFS_MMAPLOCK_EXCL) - mrunlock_excl(&ip->i_mmaplock); + up_write(&ip->i_mmaplock); else if (lock_flags & XFS_MMAPLOCK_SHARED) - mrunlock_shared(&ip->i_mmaplock); + up_read(&ip->i_mmaplock); out_undo_iolock: if (lock_flags & XFS_IOLOCK_EXCL) up_write(&VFS_I(ip)->i_rwsem); @@ -309,14 +310,14 @@ xfs_iunlock( up_read(&VFS_I(ip)->i_rwsem); if (lock_flags & XFS_MMAPLOCK_EXCL) - mrunlock_excl(&ip->i_mmaplock); + up_write(&ip->i_mmaplock); else if (lock_flags & XFS_MMAPLOCK_SHARED) - mrunlock_shared(&ip->i_mmaplock); + up_read(&ip->i_mmaplock); if (lock_flags & XFS_ILOCK_EXCL) - mrunlock_excl(&ip->i_lock); + up_write(&ip->i_lock); else if (lock_flags & XFS_ILOCK_SHARED) - mrunlock_shared(&ip->i_lock); + up_read(&ip->i_lock); trace_xfs_iunlock(ip, lock_flags, _RET_IP_); } @@ -335,9 +336,9 @@ xfs_ilock_demote( ~(XFS_IOLOCK_EXCL|XFS_MMAPLOCK_EXCL|XFS_ILOCK_EXCL)) == 0); if (lock_flags & XFS_ILOCK_EXCL) - mrdemote(&ip->i_lock); + downgrade_write(&ip->i_lock); if (lock_flags & XFS_MMAPLOCK_EXCL) - mrdemote(&ip->i_mmaplock); + downgrade_write(&ip->i_mmaplock); if (lock_flags & XFS_IOLOCK_EXCL) downgrade_write(&VFS_I(ip)->i_rwsem); @@ -365,12 +366,15 @@ xfs_isilocked( uint lock_flags) { if (lock_flags & (XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)) { - return __xfs_rwsem_islocked(&ip->i_lock.mr_lock, + ASSERT(!(lock_flags & ~(XFS_ILOCK_EXCL | XFS_ILOCK_SHARED))); + return __xfs_rwsem_islocked(&ip->i_lock, (lock_flags & XFS_ILOCK_EXCL)); } if (lock_flags & (XFS_MMAPLOCK_EXCL | XFS_MMAPLOCK_SHARED)) { - return __xfs_rwsem_islocked(&ip->i_mmaplock.mr_lock, + ASSERT(!(lock_flags & + ~(XFS_MMAPLOCK_EXCL | XFS_MMAPLOCK_SHARED))); + return __xfs_rwsem_islocked(&ip->i_mmaplock, (lock_flags & XFS_MMAPLOCK_EXCL)); } diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 3d7ce355407d..a7cf112a9e4f 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -39,8 +39,8 @@ typedef struct xfs_inode { /* Transaction and locking information. */ struct xfs_inode_log_item *i_itemp; /* logging information */ - mrlock_t i_lock; /* inode lock */ - mrlock_t i_mmaplock; /* inode mmap IO lock */ + struct rw_semaphore i_lock; /* inode lock */ + struct rw_semaphore i_mmaplock; /* inode mmap IO lock */ atomic_t i_pincount; /* inode pin count */ /* diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 81f2f93caec0..7c3df574cf4c 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1319,9 +1319,9 @@ xfs_setup_inode( */ lockdep_set_class(&inode->i_rwsem, &inode->i_sb->s_type->i_mutex_dir_key); - lockdep_set_class(&ip->i_lock.mr_lock, &xfs_dir_ilock_class); + lockdep_set_class(&ip->i_lock, &xfs_dir_ilock_class); } else { - lockdep_set_class(&ip->i_lock.mr_lock, &xfs_nondir_ilock_class); + lockdep_set_class(&ip->i_lock, &xfs_nondir_ilock_class); } /* diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 8738bb03f253..8248744f1245 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -22,7 +22,6 @@ typedef __u32 xfs_nlink_t; #include "xfs_types.h" #include "kmem.h" -#include "mrlock.h" #include #include @@ -60,6 +59,7 @@ typedef __u32 xfs_nlink_t; #include #include #include +#include #include #include diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 760901783944..1289ce1f4e9e 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -661,10 +661,8 @@ xfs_fs_inode_init_once( atomic_set(&ip->i_pincount, 0); spin_lock_init(&ip->i_flags_lock); - mrlock_init(&ip->i_mmaplock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, - "xfsino", ip->i_ino); - mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, - "xfsino", ip->i_ino); + init_rwsem(&ip->i_mmaplock); + init_rwsem(&ip->i_lock); } /*