From patchwork Tue Oct 6 19:15:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11819091 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 59B9659D for ; Tue, 6 Oct 2020 19:15:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 34867206CB for ; Tue, 6 Oct 2020 19:15:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eskTFbbK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727031AbgJFTPt (ORCPT ); Tue, 6 Oct 2020 15:15:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23621 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726924AbgJFTPt (ORCPT ); Tue, 6 Oct 2020 15:15:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602011747; 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=GfK2zbo2Eh9tb8QxND5IJB9jyJozGY1yOWTG6Y7Q5MA=; b=eskTFbbKdVqbbd9lAi8zDKK4vFaE1zBYEL2/k4/16yl0R62WK9fT7w0LVsYl9RmLxo4kZQ KGUlZ3O9YoTicndo2uXo3ARnp+4DBd7PuvBLC9ZiAX2ajxkSHFTYWlsm9EBRSeRA5jpMPI PgnnPZUHpm4kqdkDUZGMG6VWf4778N0= 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-514-npUmSguKOXmhwFTqWgsncA-1; Tue, 06 Oct 2020 15:15:46 -0400 X-MC-Unique: npUmSguKOXmhwFTqWgsncA-1 Received: by mail-wm1-f71.google.com with SMTP id z7so1478994wmi.3 for ; Tue, 06 Oct 2020 12:15:46 -0700 (PDT) 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=GfK2zbo2Eh9tb8QxND5IJB9jyJozGY1yOWTG6Y7Q5MA=; b=tPIiW87SGhIx+jiFoO4mUwLzCdrEvrWMDmgl8q3jJm1g6sNuRq84HMI1+3b2xvXF8t XyNe9iYlfdgo6XAF2VCJ/xzh0HVwxPBkgifjSa3opmQIZ9PiGMp9pjriUWpo5CgkBWL2 dpLBxkRDg+cPmraSjaxgcRwifsHrDe4F4NzUR20n8cwYKOnzqQOo7VVg0CBIs75Ril98 PJHqaEpj2rN8uhkBL0HLjjoGcVjwiVclAxJPk973sq/eYLYeu9m5QLFw3/rR/cs25j7F K1h1wd3atyB57mDztIS4qgjLNTwG1EPUORcxkx+k0d7pNxzVJgEtuDqITisS+iOYrObr wV+A== X-Gm-Message-State: AOAM533BfbYUqpx+LJFUJiMnujv6JdEodz3VtWXkMHJJbI/4Sbk6+1BL xHMsDCjaLM4DL4r14Ku/AzUYYfZdqBR6p0M/hDvOFOoZJOBSC2V/13T43TZm9tABEnGy3dnEhVc WbLX7uMFqVrv6lvuNKofV X-Received: by 2002:adf:f707:: with SMTP id r7mr6645407wrp.413.1602011744635; Tue, 06 Oct 2020 12:15:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrSF45DUmq9jVMp52RtnPMJYoMBt0Aglz9eBbK/VDZb+MYNR2km7HaCM7nBceczT5Aw0LCWw== X-Received: by 2002:adf:f707:: with SMTP id r7mr6645391wrp.413.1602011744406; Tue, 06 Oct 2020 12:15:44 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id v17sm5317074wrc.23.2020.10.06.12.15.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 12:15:43 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v9 1/4] xfs: Refactor xfs_isilocked() Date: Tue, 6 Oct 2020 21:15:38 +0200 Message-Id: <20201006191541.115364-2-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006191541.115364-1-preichl@redhat.com> References: <20201006191541.115364-1-preichl@redhat.com> MIME-Version: 1.0 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 Suggested-by: Darrick J. Wong --- fs/xfs/xfs_inode.c | 62 ++++++++++++++++++++++++++++++++++------------ fs/xfs/xfs_inode.h | 21 ++++++++++------ 2 files changed, 60 insertions(+), 23 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index c06129cffba9..f3b3821e3c35 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -345,32 +345,62 @@ xfs_ilock_demote( } #if defined(DEBUG) || defined(XFS_WARN) -int +static inline bool +__xfs_rwsem_islocked( + struct rw_semaphore *rwsem, + int lock_flags) +{ + int arg; + + if (!debug_locks) + return rwsem_is_locked(rwsem); + + if (lock_flags & (1 << XFS_SHARED_LOCK_SHIFT)) { + /* + * The caller could be asking if we have (shared | excl) + * access to the lock. Ask lockdep if the rwsem is + * locked either for read or write access. + * + * The caller could also be asking if we have only + * shared access to the lock. Holding a rwsem + * write-locked implies read access as well, so the + * request to lockdep is the same for this case. + */ + arg = -1; + } else { + /* + * The caller is asking if we have only exclusive access + * to the lock. Ask lockdep if the rwsem is locked for + * write access. + */ + arg = 0; + } + + return lockdep_is_held_type(rwsem, arg); +} + +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, + (lock_flags >> XFS_ILOCK_FLAG_SHIFT)); } - 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, + (lock_flags >> XFS_MMAPLOCK_FLAG_SHIFT)); } - 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_FLAG_SHIFT)); } ASSERT(0); - return 0; + return false; } #endif diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index e9a8bb184d1f..77d5655191ab 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -268,12 +268,19 @@ static inline void xfs_ifunlock(struct xfs_inode *ip) * Bit ranges: 1<<1 - 1<<16-1 -- iolock/ilock modes (bitfield) * 1<<16 - 1<<32-1 -- lockdep annotation (integers) */ -#define XFS_IOLOCK_EXCL (1<<0) -#define XFS_IOLOCK_SHARED (1<<1) -#define XFS_ILOCK_EXCL (1<<2) -#define XFS_ILOCK_SHARED (1<<3) -#define XFS_MMAPLOCK_EXCL (1<<4) -#define XFS_MMAPLOCK_SHARED (1<<5) + +#define XFS_IOLOCK_FLAG_SHIFT 0 +#define XFS_ILOCK_FLAG_SHIFT 2 +#define XFS_MMAPLOCK_FLAG_SHIFT 4 + +#define XFS_SHARED_LOCK_SHIFT 1 + +#define XFS_IOLOCK_EXCL (1 << (XFS_IOLOCK_FLAG_SHIFT)) +#define XFS_IOLOCK_SHARED (XFS_IOLOCK_EXCL << (XFS_SHARED_LOCK_SHIFT)) +#define XFS_ILOCK_EXCL (1 << (XFS_ILOCK_FLAG_SHIFT)) +#define XFS_ILOCK_SHARED (XFS_ILOCK_EXCL << (XFS_SHARED_LOCK_SHIFT)) +#define XFS_MMAPLOCK_EXCL (1 << (XFS_MMAPLOCK_FLAG_SHIFT)) +#define XFS_MMAPLOCK_SHARED (XFS_MMAPLOCK_EXCL << (XFS_SHARED_LOCK_SHIFT)) #define XFS_LOCK_MASK (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED \ | XFS_ILOCK_EXCL | XFS_ILOCK_SHARED \ @@ -412,7 +419,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 Oct 6 19:15:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11819093 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 B07DA112E for ; Tue, 6 Oct 2020 19:15:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 84539206CB for ; Tue, 6 Oct 2020 19:15:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CY31AKT4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726924AbgJFTPt (ORCPT ); Tue, 6 Oct 2020 15:15:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36999 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726918AbgJFTPt (ORCPT ); Tue, 6 Oct 2020 15:15:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602011748; 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=m4lYOA3dHKqQNC2RMQF6WCyySkZiAXO8oo+sg/fo1Rs=; b=CY31AKT48z457tFhkM1mX+bYdVUOXymxMGhLh754AVGQYMoyMecB1yiUM+3p34mH3+EouI rn1eRMeGcMKVZD7Vu25ju62dWvCLd/nfPzvCLBjFvmnqeQh0w+ee8c0TETVXn1h1kZAtnK 61wzW7UZW9Zg1hnxJwWEQoWLmm7JAMo= 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-163-epvaJOSVOYm4SSQjTtqT3w-1; Tue, 06 Oct 2020 15:15:46 -0400 X-MC-Unique: epvaJOSVOYm4SSQjTtqT3w-1 Received: by mail-wm1-f71.google.com with SMTP id r19so1462497wmh.9 for ; Tue, 06 Oct 2020 12:15:46 -0700 (PDT) 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=m4lYOA3dHKqQNC2RMQF6WCyySkZiAXO8oo+sg/fo1Rs=; b=GT1sHpOscb9qMiJvbPMJ7KUqzICI5I/15XhfI9Va7iZQgifJWYx5d6v901G1qox1lg m1FnwP2h9sbRQb1/sqr/VCaGESjVCslu28MlL2pXOJPTGcBhdyfpgsVowOSRNi6i7enw 85Hx96uJqRS1xkzNZCqFu032DxXaP/DzDNmBvmenNCz2DpgpPcqm5mKEy45AReOfXU3C EJJBl1TE1XTzVpF3Oiu2uBfpHEbBIqk4GUROc6gahH8HeX178qJIeq2/IqLuabnzXCFk doXEgIwIQggL6Gc7ksq3uczBnbH/VNrWvL0mcBz6dzg4YLNDWHKHlTfuwrOGQEm9OUJq YcfA== X-Gm-Message-State: AOAM531YNJUSgJmnwNPRNIWhKvV8O5l5fVjsqHtfHzSvZ+HN3EDFfVH+ sWGy7qTsy6GuJiXfVrqT08ax3SjBL41iIsDk5CLYi7ZuuWnS6cdsw7ItChzFbFNes16hho7KpCO AEBPaik0kkrabfJo/deQZ X-Received: by 2002:adf:fc0a:: with SMTP id i10mr6520586wrr.111.1602011745412; Tue, 06 Oct 2020 12:15:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHsHZT7wTqVNDdzBotNfST2iqa8MFquEnqjFvrQ9JHYBuxx6tmhDhnfu7k0Xsvpp+qTlL3Og== X-Received: by 2002:adf:fc0a:: with SMTP id i10mr6520578wrr.111.1602011745237; Tue, 06 Oct 2020 12:15:45 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id v17sm5317074wrc.23.2020.10.06.12.15.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 12:15:44 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v9 2/4] xfs: clean up whitespace in xfs_isilocked() calls Date: Tue, 6 Oct 2020 21:15:39 +0200 Message-Id: <20201006191541.115364-3-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006191541.115364-1-preichl@redhat.com> References: <20201006191541.115364-1-preichl@redhat.com> MIME-Version: 1.0 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: Darrick J. Wong --- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/xfs_file.c | 3 ++- fs/xfs/xfs_inode.c | 4 ++-- fs/xfs/xfs_qm.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 1b0a01b06a05..ced3b996cd8a 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -3883,7 +3883,7 @@ xfs_bmapi_read( ASSERT(*nmap >= 1); ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK | XFS_BMAPI_ENTIRE))); - ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED|XFS_ILOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); if (WARN_ON_ONCE(!ifp)) return -EFSCORRUPTED; diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index a29f78a663ca..c8b1d4e4199a 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -763,7 +763,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 f3b3821e3c35..035925d406d5 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2779,7 +2779,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_); @@ -3472,7 +3472,7 @@ xfs_iflush( struct xfs_mount *mp = ip->i_mount; int error; - 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_df.if_format != XFS_DINODE_FMT_BTREE || ip->i_df.if_nextents > XFS_IFORK_MAXEXT(ip, XFS_DATA_FORK)); diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index be67570badf8..57bfa5266c47 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -1803,7 +1803,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 Oct 6 19:15:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11819095 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 02E4459D for ; Tue, 6 Oct 2020 19:15:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7B5120789 for ; Tue, 6 Oct 2020 19:15:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fCTcnu0L" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727037AbgJFTPw (ORCPT ); Tue, 6 Oct 2020 15:15:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42988 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726918AbgJFTPw (ORCPT ); Tue, 6 Oct 2020 15:15:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602011750; 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=J+2dL6czcYPJdwFDJJO2gOPu3YwNkJwrAfEmGfXa0TE=; b=fCTcnu0LIsm4LT9zcdrJ0Irgj2YQOPqlUU3wNZp6dfWIy0IedHuAYxQDeLuv2rTvEGxU99 3XqQzytvq8zlcoyK8HWK22vNn8tZAvYH4XDOY+DOeKf0sZPapq76CQgLPjsrBJ6p509FIG N1kzTOgFZWntB18lnhl5+ahaukVteqE= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-560-4WVIDdE-M8uIMOuvbYxgdQ-1; Tue, 06 Oct 2020 15:15:48 -0400 X-MC-Unique: 4WVIDdE-M8uIMOuvbYxgdQ-1 Received: by mail-wm1-f70.google.com with SMTP id a25so1479561wmb.2 for ; Tue, 06 Oct 2020 12:15:47 -0700 (PDT) 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=J+2dL6czcYPJdwFDJJO2gOPu3YwNkJwrAfEmGfXa0TE=; b=L8NfFJcLI3gjWkhjyhJlGvBnLmntav6mzacv/CTf5uxw2imLvTNd7tWWqe5GWMWLJN mNWbk2qfuHpDU8r+hxxjUm+z6KZ4nLfxJfU96n6EjZbDQFHdlA5r7zTXClavaYUg9F9V eMRPbtN7w8PdnPdN8DiUQ6gUUFDZXN/zk6nWr6xfumGbVrpoV7GsrZN2yYomHpPm2wQB yJB0XIk5b+9oy+gS8UIcoOv6ZWDQBvgejeZagorlHYww5Bnc8Y8KK/4hQZ3TUY1l6VrI tVnHXcakemCu9joQeSx7IXgeUdrmN9bJrs+hNJaGr3PjGKv7W/JFGZk+tOJlRoc3xU+F hasw== X-Gm-Message-State: AOAM532/zqoXhcbWS4N/Cqqa19iFSvOzVbWxDzu0+v6DJiGmYtPQ8Qxy jheWhgfjJWIrzoSyXcXB3EDK/qAgyUt42amSIm0Nzez+iqZccNY4ZvuT/Du1jB17DO2QG7pF3/t MCPS/r67KJKKl3EETr25z X-Received: by 2002:a7b:cb8c:: with SMTP id m12mr6709445wmi.12.1602011746637; Tue, 06 Oct 2020 12:15:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKXU9NrcARYm6lGPORmUIGFXUJhFGt+4QuOay9EJUN9YsZ88H1szedsJJm9BEzU8/p4gIK0w== X-Received: by 2002:a7b:cb8c:: with SMTP id m12mr6709435wmi.12.1602011746456; Tue, 06 Oct 2020 12:15:46 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id v17sm5317074wrc.23.2020.10.06.12.15.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 12:15:45 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v9 3/4] xfs: xfs_isilocked() can only check a single lock type Date: Tue, 6 Oct 2020 21:15:40 +0200 Message-Id: <20201006191541.115364-4-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006191541.115364-1-preichl@redhat.com> References: <20201006191541.115364-1-preichl@redhat.com> MIME-Version: 1.0 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") Suggested-by: Dave Chinner Signed-off-by: Pavel Reichl Reviewed-by: Darrick J. Wong --- 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 ced3b996cd8a..ff5cc8a5d476 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5787,7 +5787,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); @@ -5904,7 +5905,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 Oct 6 19:15:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11819097 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 EA8A059D for ; Tue, 6 Oct 2020 19:16:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B117D206F4 for ; Tue, 6 Oct 2020 19:16:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dCf64u6h" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbgJFTQB (ORCPT ); Tue, 6 Oct 2020 15:16:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36040 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727033AbgJFTQA (ORCPT ); Tue, 6 Oct 2020 15:16:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602011757; 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=LW8Nd1gmoXyRVUhU85FAeRla1hlIXdv1edHwm/LKMso=; b=dCf64u6hlKHJEHc6PsTAQTsLDnPHRNOk8QVyCm4YawRqBno/BBRP78tOs+drhkJrn7Xqwc bKG07VLgx/oErtkbI6UbiUkTCtfaczRmcltr6cc6w3U4fYRWf0J07PgnCrCZ66uSsV/Fpd 0XpfXhXHPcC/J+flyofxyapauEd09QU= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-77-QCFx9E8MM8aJeucAWR76ZA-1; Tue, 06 Oct 2020 15:15:49 -0400 X-MC-Unique: QCFx9E8MM8aJeucAWR76ZA-1 Received: by mail-wm1-f72.google.com with SMTP id z7so1479053wmi.3 for ; Tue, 06 Oct 2020 12:15:49 -0700 (PDT) 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=LW8Nd1gmoXyRVUhU85FAeRla1hlIXdv1edHwm/LKMso=; b=TAPUajkvVnyI0qFNuTk4QOoNg8VEAx/IpActAZij9nL/11WvoZXciHvx2zg8IzDz0l L0E/EbE457wA0WtAsweYVWAqgy5fGefiN8ncC/qfNxuxfLPch1GyiGX2dVVy1qHGifRq 0oJUNJCwy4YPbcv5LviitfSMMbwMgOuD1V60MLj1MdixNwmNg35wESjOGfo8NNUMK1j4 8UguYM2D0GQEQXv7SPUuqJ0OOu0VFofmxGCB6zp4Su/+V0QglEzAEEimb7SSC+5XPH21 4gsTJQUnigWH+DYTsyOjwfNx9sJZ1M5R3PUNdBkgWZhzd20npSkffStVyBLoSTC2Lamr f9Ag== X-Gm-Message-State: AOAM533U0FSZpgna8Tt2+f3sjXZjDg0MtbS3y66sNmrEH48kDKOLywID 7QLuVw2x5Ag31BYFYg8c4SrsB9AnQJFKbsGYdX3nt6qMa5Cil3ZJ1XEH3Ch4cB8W3PPlJmqcr14 Os9D/QgY8b2T3ZFjn6kBG X-Received: by 2002:a1c:c28a:: with SMTP id s132mr6708920wmf.13.1602011747954; Tue, 06 Oct 2020 12:15:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLsKH5bQ/erpgc3dQUpdZco58PoZdXjLfzhhpiLMcRx6zoWQ78ZRqOtNjcEc1/cFtNA41aJQ== X-Received: by 2002:a1c:c28a:: with SMTP id s132mr6708910wmf.13.1602011747641; Tue, 06 Oct 2020 12:15:47 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id v17sm5317074wrc.23.2020.10.06.12.15.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 12:15:46 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v9 4/4] xfs: replace mrlock_t with rw_semaphores Date: Tue, 6 Oct 2020 21:15:41 +0200 Message-Id: <20201006191541.115364-5-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006191541.115364-1-preichl@redhat.com> References: <20201006191541.115364-1-preichl@redhat.com> MIME-Version: 1.0 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. Release the lock in xfs_btree_split() just before the work-queue executing xfs_btree_split_worker() is scheduled and make xfs_btree_split_worker() to acquire the lock as a first thing and release it just before returning from the function. This it done so the ownership of the lock is transfered between kernel threads and thus lockdep won't complain about lock being held by a different kernel thread. Signed-off-by: Pavel Reichl --- fs/xfs/libxfs/xfs_btree.c | 14 +++++++ fs/xfs/mrlock.h | 78 --------------------------------------- fs/xfs/xfs_inode.c | 36 ++++++++++-------- fs/xfs/xfs_inode.h | 4 +- fs/xfs/xfs_iops.c | 4 +- fs/xfs/xfs_linux.h | 2 +- fs/xfs/xfs_super.c | 6 +-- 7 files changed, 41 insertions(+), 103 deletions(-) delete mode 100644 fs/xfs/mrlock.h diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c index 2d25bab68764..1d1bb8423688 100644 --- a/fs/xfs/libxfs/xfs_btree.c +++ b/fs/xfs/libxfs/xfs_btree.c @@ -2816,6 +2816,7 @@ xfs_btree_split_worker( unsigned long pflags; unsigned long new_pflags = PF_MEMALLOC_NOFS; + rwsem_acquire(&args->cur->bc_ino.ip->i_lock.dep_map, 0, 0, _RET_IP_); /* * we are in a transaction context here, but may also be doing work * in kswapd context, and hence we may need to inherit that state @@ -2832,6 +2833,7 @@ xfs_btree_split_worker( complete(args->done); current_restore_flags_nested(&pflags, new_pflags); + rwsem_release(&args->cur->bc_ino.ip->i_lock.dep_map, _THIS_IP_); } /* @@ -2863,8 +2865,20 @@ xfs_btree_split( args.done = &done; args.kswapd = current_is_kswapd(); INIT_WORK_ONSTACK(&args.work, xfs_btree_split_worker); + /* + * Update lockdep's ownership information to reflect that we + * will be transferring the ilock from this thread to the + * worker. + */ + rwsem_release(&cur->bc_ino.ip->i_lock.dep_map, _THIS_IP_); queue_work(xfs_alloc_wq, &args.work); wait_for_completion(&done); + /* + * Update lockdep's lock ownership information to point to + * this thread as the lock owner now that the worker item is + * done. + */ + rwsem_acquire(&cur->bc_ino.ip->i_lock.dep_map, 0, 0, _RET_IP_); destroy_work_on_stack(&args.work); return args.result; } 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 035925d406d5..213a4a947854 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); @@ -385,11 +386,14 @@ xfs_isilocked( uint lock_flags) { 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, (lock_flags >> XFS_ILOCK_FLAG_SHIFT)); } 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, (lock_flags >> XFS_MMAPLOCK_FLAG_SHIFT)); } diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 77d5655191ab..02c98ecfe4c5 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 80a13c8561d8..66cca3e599c7 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1336,9 +1336,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 ab737fed7b12..ba37217f86d2 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 @@ -61,6 +60,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 71ac6c1cdc36..00be9cfa29fa 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -708,10 +708,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); } /*