From patchwork Tue Feb 11 22:10:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11376995 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 B5F3192A for ; Tue, 11 Feb 2020 22:10:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92FE52073C for ; Tue, 11 Feb 2020 22:10:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="G9eGW/J2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727111AbgBKWKZ (ORCPT ); Tue, 11 Feb 2020 17:10:25 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:60596 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727054AbgBKWKY (ORCPT ); Tue, 11 Feb 2020 17:10:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581459024; 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; bh=CIHj4fmFOPkcDFDIVcWIGi8WITB3+o9MuIUoCmi4ZKY=; b=G9eGW/J2Hi9M4P8uZrlKNKqu0dm+Vi9UUKjC74WytfalVppRAbxsUP/MDKFrOaxwQb9v0+ pnJ++CE9RKsWbwRgn609jjcRITghbU0E/kgZSbl4R9o5X3BR3zeapKMn9slfl4rzQ9VlYO YcttY87hrj0dHqlwvyl8xjcJSPeQZJM= 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-390-aR4UM8CZME6FGd4eRQle5A-1; Tue, 11 Feb 2020 17:10:21 -0500 X-MC-Unique: aR4UM8CZME6FGd4eRQle5A-1 Received: by mail-wr1-f71.google.com with SMTP id n23so7675703wra.20 for ; Tue, 11 Feb 2020 14:10:21 -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:mime-version :content-transfer-encoding; bh=CIHj4fmFOPkcDFDIVcWIGi8WITB3+o9MuIUoCmi4ZKY=; b=nSvli2UWJyf3O7Pfl3eICvE4mNPOPL6Mva63sx4AUVsiQ6nBiGYXapdYes65vDcAR8 dS7qWgWiI4MnjNvt+xXEvdXBMNpPcr6Fxpjqent01nOGFCdzG5r6k8Zig475rH4zAecQ ObrXDedQc2t/tP6+Rn8AWzXUnwhzhOJZRIuDrH670z1CQpYOfGGlNp0+f1Wm6bVmXgqd qqWzXje4vryn00nhOfRlHe55PINwCvptOZe35uJty9qOoCVU/DqN2dzzknQSQLD+iker cRYQ12kDWuIdv1sP3J4sLRDNcckUsfCBbFxtJGsHtWMPIlttw0KdP5hfMgFKWobQp7Bf aozQ== X-Gm-Message-State: APjAAAUqjqh218zKhNT4FcM2nbuf3RqarxAh9kCs3Q6W+LPd0IqBSvSO vYbCpFi7wkjJfbkMiw6MTetDuqdpe0tzLLkqFcvG2xWK7eDxpCOKG6Zl3ohMk4HIdsT6Zt4mA/t xa+dpUzKupCxmT0mieAoe X-Received: by 2002:a1c:6a16:: with SMTP id f22mr7861389wmc.53.1581459019836; Tue, 11 Feb 2020 14:10:19 -0800 (PST) X-Google-Smtp-Source: APXvYqwh71D7CtpfEocX+t/YqT5oQ3B/V7hoENWFJ2njgWT7uL0Xr5w843zVAaOD1gYD9tjqrVMw1A== X-Received: by 2002:a1c:6a16:: with SMTP id f22mr7861379wmc.53.1581459019597; Tue, 11 Feb 2020 14:10:19 -0800 (PST) Received: from localhost.localdomain.com (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id p12sm4896786wrx.10.2020.02.11.14.10.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 14:10:19 -0800 (PST) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v4 1/4] xfs: Refactor xfs_isilocked() Date: Tue, 11 Feb 2020 23:10:15 +0100 Message-Id: <20200211221018.709125-1-preichl@redhat.com> X-Mailer: git-send-email 2.24.1 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 --- Changelog from V3: Added ASSERTS() to isilocked() to make sure that only flags for a single type of lock are passed fs/xfs/xfs_inode.c | 51 ++++++++++++++++++++++++++++++++++------------ fs/xfs/xfs_inode.h | 2 +- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index c5077e6326c7..cfefa7543b37 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -345,32 +345,57 @@ xfs_ilock_demote( } #if defined(DEBUG) || defined(XFS_WARN) -int +static inline bool +__xfs_rwsem_islocked( + struct rw_semaphore *rwsem, + bool shared, + bool excl) +{ + bool locked = false; + + if (!rwsem_is_locked(rwsem)) + return false; + + if (!debug_locks) + return true; + + if (shared) + locked = lockdep_is_held_type(rwsem, 0); + + if (excl) + locked |= lockdep_is_held_type(rwsem, 1); + + return locked; +} + +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); + ASSERT(!(lock_flags & ~(XFS_ILOCK_EXCL|XFS_ILOCK_SHARED))); + return __xfs_rwsem_islocked(&ip->i_lock.mr_lock, + (lock_flags & XFS_ILOCK_SHARED), + (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); + ASSERT(!(lock_flags & ~(XFS_MMAPLOCK_EXCL|XFS_MMAPLOCK_SHARED))); + return __xfs_rwsem_islocked(&ip->i_mmaplock.mr_lock, + (lock_flags & XFS_MMAPLOCK_SHARED), + (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); + ASSERT(!(lock_flags & ~(XFS_IOLOCK_EXCL|XFS_IOLOCK_SHARED))); + return __xfs_rwsem_islocked(&VFS_I(ip)->i_rwsem, + (lock_flags & XFS_IOLOCK_SHARED), + (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 Tue Feb 11 22:10:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11376997 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 0F5D31820 for ; Tue, 11 Feb 2020 22:10:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E033E20848 for ; Tue, 11 Feb 2020 22:10:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CHi8An3Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727199AbgBKWKZ (ORCPT ); Tue, 11 Feb 2020 17:10:25 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:30421 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727041AbgBKWKZ (ORCPT ); Tue, 11 Feb 2020 17:10:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581459023; 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=d7919lYQYI4lwq2Mpm2pPCii3+x0+t8tskinkCVUsr8=; b=CHi8An3QXvdFPwOkGnAO9q43HlXEkbckmtod5tyi018WisO2E5/s8j22R38fGxTnrWwsr2 XupDt8hpKnNLW845BwNBc2jUWqmWMNdsKMflObCNiVUpOiYIfdLwGoPDiFCcm5JFHHb+lm Sqg6Ev8RYsn6nzSQHXzvVI3A9aYxS1w= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-16-kTbCxGkdObmOgMTHqfuCQQ-1; Tue, 11 Feb 2020 17:10:22 -0500 X-MC-Unique: kTbCxGkdObmOgMTHqfuCQQ-1 Received: by mail-wm1-f71.google.com with SMTP id d4so96596wmd.7 for ; Tue, 11 Feb 2020 14:10:22 -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=d7919lYQYI4lwq2Mpm2pPCii3+x0+t8tskinkCVUsr8=; b=XNfIdwE1pfc4e13lr2R0J+01pqmgCEsfoHd815cLDrDM96BzLqtEh/tNXoHS8R0hCf magCX2Ssqv6xwMTMCLpkNcNaRW/HZpSkufsqsPK4Z4il6QA9vmfIVBTlOj+lCkbKEorv jzkDcJfnwbYMR2xVngesfTQ7YZHHN7qifMO7pgUtXmAeyQwStgkkH0bK9kuAkc2U65w1 xTYZ+MPzfGdM4DaK8pxhRKcCaObeoo+AIyW6Uy8dfsyro6UVk6o2a+2e5jddOMeVGrfK S4Btgq6M+SLONOBgnFfyH17PDuwp/AHHBqVn0fve/GlRt+dZWFEQqt79XCIufXIVNapb nsKg== X-Gm-Message-State: APjAAAUtdOGObFS5twXYQ54zVlmBMIflUG58X5oeXlDqapqRCptwp9d7 xmdp9tYfDZuG0S0sAhs0ZCTx/9AzPHw7cidRVE7Ea4Mha2H9hYoo1PzEeaiKMS77eYEZ1JqbL8r +jZUoYMQYnm+Qn/5JOz73 X-Received: by 2002:a1c:e488:: with SMTP id b130mr7713549wmh.108.1581459020830; Tue, 11 Feb 2020 14:10:20 -0800 (PST) X-Google-Smtp-Source: APXvYqwHnX3rD5/WAvIbPYmTX9OVp2Q4ApXUHG8cwExBpK4Wr/evNJZYRel0+9HDorqLbblZZvPYHw== X-Received: by 2002:a1c:e488:: with SMTP id b130mr7713533wmh.108.1581459020650; Tue, 11 Feb 2020 14:10:20 -0800 (PST) Received: from localhost.localdomain.com (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id p12sm4896786wrx.10.2020.02.11.14.10.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 14:10:20 -0800 (PST) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v4 2/4] xfs: Fix WS in xfs_isilocked() calls Date: Tue, 11 Feb 2020 23:10:16 +0100 Message-Id: <20200211221018.709125-2-preichl@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200211221018.709125-1-preichl@redhat.com> References: <20200211221018.709125-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 Signed-off-by: Pavel Reichl --- 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 cfefa7543b37..be1f06fe1016 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2831,7 +2831,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_); @@ -3695,7 +3695,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)); @@ -3827,7 +3827,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 Tue Feb 11 22:10:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11376999 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 0BE3492A for ; Tue, 11 Feb 2020 22:10:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0B862082F for ; Tue, 11 Feb 2020 22:10:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JbhLRPJW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727279AbgBKWK0 (ORCPT ); Tue, 11 Feb 2020 17:10:26 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:39658 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727054AbgBKWK0 (ORCPT ); Tue, 11 Feb 2020 17:10:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581459025; 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=Z+lCgrRtAhH3fiFQK/QvncAiSimhafm7U8lRQyzKh2Y=; b=JbhLRPJWN2gEz7YCMqSQgo2axwKwa3eoCOXH43AZmis43NbPszV0GDYhd740BTjtTmefy+ vLU8xIS8D0m/yXonQVgdpsHw/+X14EDtLa7iOmbWpmNmrnVQCF4suBIA87R7dTLsF7/dHB VjCMM3AYatPdd3qMuU++WqQUokkV0gI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-336-SoKGZHv7Mm2wYLhTmr1-yw-1; Tue, 11 Feb 2020 17:10:23 -0500 X-MC-Unique: SoKGZHv7Mm2wYLhTmr1-yw-1 Received: by mail-wm1-f71.google.com with SMTP id f66so91843wmf.9 for ; Tue, 11 Feb 2020 14:10:22 -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=Z+lCgrRtAhH3fiFQK/QvncAiSimhafm7U8lRQyzKh2Y=; b=ekwOEnY0U84OQeQVRMpNM/F/aJkywbK7XqqYmA9g4fXErqaeIIFSRa3BxYCV3yDUss XTLWfT5nY0qmeBpCLDMwkK7GcB1zw4qcfUI/gvNKCrzQjTmlVAbqD+OWcgZ+G9pCyB5V WGlUdRxFQdYQgW4pzcunq7YJ2HvK0HPG3F4fmUpZznXieVyQKzvq/flP2cBn4aoTcgTM yJFl8IbhP/qr64Zq3N8SeOfqp/MWdChnP3mIUB0q2qWfc2bzyYe/u8dOgSbRCOdt1ru4 Qw1hbhdeFNO6+KXOrKcYyXivoSS7GkizXUElAhYat9jstcYcL8hPGIwJh/mYVDl1okUg v1Vg== X-Gm-Message-State: APjAAAXX9lErIyLYNMCCBni92vJXRVWFYfgIQq7iRr16lYVujt/Atttr JVL4MatFr65wHldupwE0e6Llo17SZIeKFzH5Qwnuk54zSt12Bi9x9/m37RixkfeIfMJz8PpSrIR n16YjQ9M8OUqM5Z0pA10P X-Received: by 2002:a1c:451:: with SMTP id 78mr7691207wme.125.1581459021713; Tue, 11 Feb 2020 14:10:21 -0800 (PST) X-Google-Smtp-Source: APXvYqwYbizT5rL7L5u2gZlyaltMJhnmrDvma5ecOo0LeC7XPDd/hzLOX4oIulNgSev7rABpVhZnzw== X-Received: by 2002:a1c:451:: with SMTP id 78mr7691195wme.125.1581459021444; Tue, 11 Feb 2020 14:10:21 -0800 (PST) Received: from localhost.localdomain.com (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id p12sm4896786wrx.10.2020.02.11.14.10.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 14:10:20 -0800 (PST) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v4 3/4] xfs: Fix bug when checking diff. locks Date: Tue, 11 Feb 2020 23:10:17 +0100 Message-Id: <20200211221018.709125-3-preichl@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200211221018.709125-1-preichl@redhat.com> References: <20200211221018.709125-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 Suggested-by: Dave Chinner Signed-off-by: Pavel Reichl --- Changelog from V3: Commit message extened. 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 Tue Feb 11 22:10:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11377001 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 54A9A14E3 for ; Tue, 11 Feb 2020 22:10:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A59B20708 for ; Tue, 11 Feb 2020 22:10:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Yi55DhQR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727054AbgBKWK1 (ORCPT ); Tue, 11 Feb 2020 17:10:27 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52782 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727041AbgBKWK1 (ORCPT ); Tue, 11 Feb 2020 17:10:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581459025; 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=EfzpsI+b0FxhkHiEHJe1gTxHOAA01iPzXCbTPwR+Eng=; b=Yi55DhQRX9UHVvVliu8qrMVqzKGU6q8FLUT/62uayuMP8ZTmGJQDVjk32DaCofiruPODFa nxJsSF/AXqddho5Bgvw8zn9bM2jlncpkDQbVRS7dTBVljTNmPml/gfy4TbN3/gf0aesF4r EDpib5NUb8IwKiR/AggFWgognsA+vFw= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-236-P-daeRbEOXmh8ihQCZwcug-1; Tue, 11 Feb 2020 17:10:24 -0500 X-MC-Unique: P-daeRbEOXmh8ihQCZwcug-1 Received: by mail-wm1-f69.google.com with SMTP id o24so110727wmh.0 for ; Tue, 11 Feb 2020 14:10:23 -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=EfzpsI+b0FxhkHiEHJe1gTxHOAA01iPzXCbTPwR+Eng=; b=NMlWUPoB7HsbxqVW7KfTtavbbNfqG2hvSYiSdrJpDEX6kRhmd/2iQK3TCVZjFhBjzf cmc28auGS7cz2ESMZK4kTwodxF4FODBZx/+J+tG+nrHlSQmxiTTdHXIO/+eTo0pei2Qx 7Y+qRJvWuNm4p+EpqDwb5C4qOy1Jw10g3Y+hF3lgWent3x1rYtOcqh4pd9sppjvCreA3 C3H8nHtQdAj6a/jruBrbLHxrayvFmD0N45KvM17nytdOSUfb0hSaEifsj3DlxtMnurBp nO91OagLv7YTgVLx6tyQ9D2TTlDy0tEGkXRTEKEqg2UCjjU/o39oBUmCm6w23JxvGWIN j6KQ== X-Gm-Message-State: APjAAAU+gyz6PVQ6ZTFR2WXUhj8P0GSXxy5lj2TiXTQ0Cp0ULVXzlSxH sn3kueXaNTIpKfTBccUg1F5Mifa0M4n1EejyrXVGX0+Zl0MU3eJsEDpe/qnonMciyqBv4oSi8JE mbipn0XuZcFt5c4HzysIM X-Received: by 2002:adf:e68d:: with SMTP id r13mr10724447wrm.349.1581459022561; Tue, 11 Feb 2020 14:10:22 -0800 (PST) X-Google-Smtp-Source: APXvYqw74+3XViJPAtVIoCm3/Dhny9pGV0cf4f7IgkRV35EKNWVJAQZkUxoTBuHiepMfsKX/sKz4og== X-Received: by 2002:adf:e68d:: with SMTP id r13mr10724427wrm.349.1581459022276; Tue, 11 Feb 2020 14:10:22 -0800 (PST) Received: from localhost.localdomain.com (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id p12sm4896786wrx.10.2020.02.11.14.10.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 14:10:21 -0800 (PST) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v4 4/4] xfs: Replace mrlock_t by rw_semaphore Date: Tue, 11 Feb 2020 23:10:18 +0100 Message-Id: <20200211221018.709125-4-preichl@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200211221018.709125-1-preichl@redhat.com> References: <20200211221018.709125-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 --- fs/xfs/mrlock.h | 78 ---------------------------------------------- fs/xfs/xfs_inode.c | 37 +++++++++++----------- fs/xfs/xfs_inode.h | 6 ++-- fs/xfs/xfs_iops.c | 4 +-- fs/xfs/xfs_linux.h | 1 - fs/xfs/xfs_super.c | 6 ++-- 6 files changed, 27 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 be1f06fe1016..35a486cfa43c 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); @@ -375,14 +376,14 @@ xfs_isilocked( { if (lock_flags & (XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)) { ASSERT(!(lock_flags & ~(XFS_ILOCK_EXCL|XFS_ILOCK_SHARED))); - return __xfs_rwsem_islocked(&ip->i_lock.mr_lock, + return __xfs_rwsem_islocked(&ip->i_lock, (lock_flags & XFS_ILOCK_SHARED), (lock_flags & XFS_ILOCK_EXCL)); } if (lock_flags & (XFS_MMAPLOCK_EXCL|XFS_MMAPLOCK_SHARED)) { ASSERT(!(lock_flags & ~(XFS_MMAPLOCK_EXCL|XFS_MMAPLOCK_SHARED))); - return __xfs_rwsem_islocked(&ip->i_mmaplock.mr_lock, + return __xfs_rwsem_islocked(&ip->i_mmaplock, (lock_flags & XFS_MMAPLOCK_SHARED), (lock_flags & XFS_MMAPLOCK_EXCL)); } diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 3d7ce355407d..8b30f82b9dc0 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -9,6 +9,8 @@ #include "xfs_inode_buf.h" #include "xfs_inode_fork.h" +#include + /* * Kernel only inode definitions */ @@ -39,8 +41,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..921a3eb093ed 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 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); } /*