From patchwork Fri Mar 20 21:03:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11450369 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 98D091392 for ; Fri, 20 Mar 2020 21:03:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7021120777 for ; Fri, 20 Mar 2020 21:03:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WyHiQkKy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727016AbgCTVDg (ORCPT ); Fri, 20 Mar 2020 17:03:36 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:60122 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727261AbgCTVDf (ORCPT ); Fri, 20 Mar 2020 17:03:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584738215; 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=lAxEUE3XwljgZQNfiIhQ1uRgNkAw845DwaZy+s3uKVE=; b=WyHiQkKyiAUn3Zpw3o58mVRcV9bXYVEcmlwl4HEgY23+mLFFg9F2ogitdE32FBaOeY6qRm YcZbamPwsH7nfqjHjugaYzQOqyfeUlwSC710B7c/rB3rNzn4QIsZXh9HOsp3eZrQSVgUQz jx5HlPEtqyCIyVJapZBA8F/vZOwme9U= 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-39-4V9FiKXvP16iNt3NX_N6VQ-1; Fri, 20 Mar 2020 17:03:33 -0400 X-MC-Unique: 4V9FiKXvP16iNt3NX_N6VQ-1 Received: by mail-wr1-f72.google.com with SMTP id p2so3205872wrw.8 for ; Fri, 20 Mar 2020 14:03:33 -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=lAxEUE3XwljgZQNfiIhQ1uRgNkAw845DwaZy+s3uKVE=; b=fLrdEEmwy4fmpRTbQt2oUc6Shovj3sSkN2EwCliL9kX4Uf0cJimPQcK9MRGhwthyWJ qWUtVc33pl+qWSBzQolTbeNCkPFuh+hzGr7f5/ShMy69hJYcX0rMOkmHq6mvW1Bv8LLe Qk0BKF3uQUeL5C7wFNeoBpzQDFzQ13V0l0UpdWrNiooV9oneDFSmB/gDoHaehUYOISS9 i5U1QZu4uzRxbLJSEBOhLCAAEXPdP3fKi7hbqGwu6b6+Fwm6XyJH+peokn7MxGv7xMXp XukHPJlWGMPqDjOLRWWL0BrGtXHfgYJvmA6JVdwR5QjshAUjCO4a9vlPRuSDMpm8RTAU 9+fw== X-Gm-Message-State: ANhLgQ1Vs6PrTdw+p2FzoVRXWlkM4bHH/moauHKFvnZyiDyxous4RxPz qXixxt+cKf26RG3KqkNRb6cPM7RKs64a1c8fy+AJ2x54VZtfxbJxMJFrs7TalhI56i9qrTnyXWs qFEH1urY+EL//sfqEzWHA X-Received: by 2002:adf:f749:: with SMTP id z9mr12880955wrp.332.1584738211764; Fri, 20 Mar 2020 14:03:31 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuTF0EVi56lFI2qhq+DVgfTSz/Scp0AxQjHd4MBXpYA7AIYRlJHBrWx4WpL9RF5WAXXIuOkSg== X-Received: by 2002:adf:f749:: with SMTP id z9mr12880935wrp.332.1584738211534; Fri, 20 Mar 2020 14:03:31 -0700 (PDT) Received: from localhost.localdomain.com (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id w7sm10479668wrr.60.2020.03.20.14.03.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 14:03:30 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v7 1/4] xfs: Refactor xfs_isilocked() Date: Fri, 20 Mar 2020 22:03:14 +0100 Message-Id: <20200320210317.1071747-2-preichl@redhat.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320210317.1071747-1-preichl@redhat.com> References: <20200320210317.1071747-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 Suggested-by: Darrick J. Wong --- Changes from V6: * __xfs_rwsem_islocked() takes flags param * changed logic of __xfs_rwsem_islocked() so that holding a rwsem writte-locked implies read access as wel 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 c5077e6326c7..db356f815adc 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 492e53992fa9..8df2c9e1a34e 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -272,12 +272,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 \ @@ -416,7 +423,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 Fri Mar 20 21:03: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: 11450371 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 D49321392 for ; Fri, 20 Mar 2020 21:03:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5B2120777 for ; Fri, 20 Mar 2020 21:03:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="c4OjrPda" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727261AbgCTVDk (ORCPT ); Fri, 20 Mar 2020 17:03:40 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:46626 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbgCTVDk (ORCPT ); Fri, 20 Mar 2020 17:03:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584738218; 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=dW3EbRkshj9JpOctSp2z4KTvGyhVHIf5NPCI25idIlI=; b=c4OjrPdarxyH2JXrpxY76vYQS/tRvf6ZR1YD0faSCfRTlSQPPQqCaZpiByyWfw+aCy2YOJ 3/2n38D2aPjhDUom3dMou5GnZENkBLAJQRw8lkFqU7YGOO8L/09c6qPUF7xURW0EyFqVCx lEO0xz9Ux2Kmdax4vNZDatSKg+ZjOUo= 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-25-N33R0scEMJmQo0Zyk4Fd3w-1; Fri, 20 Mar 2020 17:03:37 -0400 X-MC-Unique: N33R0scEMJmQo0Zyk4Fd3w-1 Received: by mail-wr1-f71.google.com with SMTP id u18so3193805wrn.11 for ; Fri, 20 Mar 2020 14:03:37 -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=dW3EbRkshj9JpOctSp2z4KTvGyhVHIf5NPCI25idIlI=; b=XyCv2P9XNiupDzHxgqAe02z5BDiiUDpJw4Mh5+bcI825Uxq3EAaHPB/fNKT97arj/f v2VYXkix+RFF51RZPWC2miEs7cRsHvnW1NRfaTTbsVCGvT88n+G1+5Tc4B+B7j8cU069 z1DOCytOs/Ffn9qbcezAKIVHtG7fBzZ/7gQOWk6OTv5Qz/3RwaU06gxLtc4yII8Ttu/1 hBKvz8jJtlZDvI0d2bmPmrOR6wTkE90fjnummkEFLdd3VBM/P2zKRFI62Va20BxOer8X yXl8Nxv3bK75JMjdRZffvp6kfKspD/CMoUJuOLV2yfkajIqeIKJSpnz4KOv/zD+74fmP 4CQQ== X-Gm-Message-State: ANhLgQ39LuBg2UCvDLjDh4/G2n1mpEDvnZ9SUYeSjSs5BqhgAKw9dImJ WhXjIwXc9LSfot5HfWVJWZ6ybSjLJ2HdOx9D13/ccP3CL/bWiAxMhHZhaNvz+318YIj3AW9XC0T T19kYf3XW3YpEU1FJc438 X-Received: by 2002:adf:f688:: with SMTP id v8mr13363017wrp.344.1584738215572; Fri, 20 Mar 2020 14:03:35 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsd4UVj8sgv3MbuWmHHfyPwK3arKNVp39EQfG9Dj7aqv7LA5/qk3wEUYN1lhUp1FYaJpzBO/Q== X-Received: by 2002:adf:f688:: with SMTP id v8mr13363001wrp.344.1584738215372; Fri, 20 Mar 2020 14:03:35 -0700 (PDT) Received: from localhost.localdomain.com (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id w7sm10479668wrr.60.2020.03.20.14.03.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 14:03:34 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v7 2/4] xfs: clean up whitespace in xfs_isilocked() calls Date: Fri, 20 Mar 2020 22:03:15 +0100 Message-Id: <20200320210317.1071747-3-preichl@redhat.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320210317.1071747-1-preichl@redhat.com> References: <20200320210317.1071747-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 --- 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 db356f815adc..dec66059b045 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2836,7 +2836,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_); @@ -3700,7 +3700,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)); @@ -3832,7 +3832,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 Fri Mar 20 21:03: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: 11450373 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 8A98913B1 for ; Fri, 20 Mar 2020 21:03:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 695A120709 for ; Fri, 20 Mar 2020 21:03:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CGCRWeBR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727264AbgCTVDn (ORCPT ); Fri, 20 Mar 2020 17:03:43 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:46441 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbgCTVDm (ORCPT ); Fri, 20 Mar 2020 17:03:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584738221; 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=y6JvE2XM3f5G73ENCohJroPWB8ILaAoDXoWtL5206qY=; b=CGCRWeBRnmCqL4bdZCpAvlI8SNuECPlwDBZ5yIjuRNASSmX8Gdrn8JSwrlqJ1g7V9RKwS/ 21uoadvhZ0dfttjixfyu0wxcyM4IuUiLfpbXGx/pOEyJ6UWapaJWTYhjU90LdzsMshMWtS TotfY5G+GJvUfIoR1tJDGn5F/jbF4M4= 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-350-_EDhaaq8MFaKwiivk6496w-1; Fri, 20 Mar 2020 17:03:39 -0400 X-MC-Unique: _EDhaaq8MFaKwiivk6496w-1 Received: by mail-wr1-f72.google.com with SMTP id u12so3217748wrw.10 for ; Fri, 20 Mar 2020 14:03:38 -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=y6JvE2XM3f5G73ENCohJroPWB8ILaAoDXoWtL5206qY=; b=HDLVWepj8qIc5EtwtPHaxIOsmiVdY2lIWbd6R+tcpBjL5KN1V4vIZ6ea4jZfJLDsvE 0bNN7Gom+6b5L8t2RYCVGQMzpsszRQkl8OPnBH4KFrGQCAxV19p7v3sJO0eQkDzH0/RF lWK4BFTs00HV6fFA/SRew3gHJxbmadVlD7EJHa+zMt7uq3eMnGDqMkv9U4eYy8jSQan8 M/1Jo1daT5h9tr33WssFH1oDBRfmX/E3WLCSrEkvztfLTss9P0yH8qTghNs2U1JVCYii 5UqX8ztm9L8LTVu111+5Qpx7PuAVvjQ5xjJQ2ywIOfQXzwpmCrPyA4jiCvef+BetMFdg iD2Q== X-Gm-Message-State: ANhLgQ1EN8Fs13gvjqxmx573ycyNFqypjNXuuyeplIzc3ii+SOQ8pJ41 qk0CEe/62dxZ7UYEkBcfLMpu0ebxU6bkMhTH2KkaQ5rwUSS8LNUZ1D8IayR7xhV22Vrc845bSQk JZXY7g4LFmqu1uz0ZKZwu X-Received: by 2002:a7b:cc72:: with SMTP id n18mr3516933wmj.71.1584738217383; Fri, 20 Mar 2020 14:03:37 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvbs8ThiGZm0KwRVdrjrh7GTleswhlbcKwvj4GmruMC1YdxFyftWuklaq3UETDAwy9z/nPY8A== X-Received: by 2002:a7b:cc72:: with SMTP id n18mr3516923wmj.71.1584738217145; Fri, 20 Mar 2020 14:03:37 -0700 (PDT) Received: from localhost.localdomain.com (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id w7sm10479668wrr.60.2020.03.20.14.03.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 14:03:35 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v7 3/4] xfs: xfs_isilocked() can only check a single lock type Date: Fri, 20 Mar 2020 22:03:16 +0100 Message-Id: <20200320210317.1071747-4-preichl@redhat.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320210317.1071747-1-preichl@redhat.com> References: <20200320210317.1071747-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 --- 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 Fri Mar 20 21:03: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: 11450375 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 8D1CB13B1 for ; Fri, 20 Mar 2020 21:03:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63AE120709 for ; Fri, 20 Mar 2020 21:03:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cEdFHzQo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727268AbgCTVDs (ORCPT ); Fri, 20 Mar 2020 17:03:48 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:25471 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbgCTVDr (ORCPT ); Fri, 20 Mar 2020 17:03:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584738226; 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=7OR4oCARfHcUZntC4AgiNzAySZqjPFQ6DiZjBQ8C69I=; b=cEdFHzQo5hyw+UTsRt0twTcpdn58UbQLJ5ne4xJiyc/XNotpk8lhfZveFSa02bowgKD97h q7M+KOic2N7cJGU0hey7uC+kFYcFRnHViGI4BiCaR65STmDNh6zVWj9kh6eS2D53fcQK8C K9UL6h/9rtpGoSe79KhRUlOw596B/tg= 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-84-I9E-CL74OjOepPbpWQ6ANQ-1; Fri, 20 Mar 2020 17:03:44 -0400 X-MC-Unique: I9E-CL74OjOepPbpWQ6ANQ-1 Received: by mail-wr1-f72.google.com with SMTP id d1so2067340wru.15 for ; Fri, 20 Mar 2020 14:03:44 -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=7OR4oCARfHcUZntC4AgiNzAySZqjPFQ6DiZjBQ8C69I=; b=LID7jLKRsRMt3wQ5aY+hCDHB1Fr6nAMzux453eLVp0Zu0FioyOAY3tn6viBJ20JplS WFf1N4riYLYc3v59/Lois+9M1HC6+lLQxBJDpxgPzZdsr5bSsTatfT0wXFODB8JNvZTU WyybgixTGl7JZsaq0mY3VWorZGncq7i2kxkjX/xuucak8yh5RjFrXdiQyLAcOLORcn5J 1y+UAAuRNxwbwgBeO0zRCT0AYyJLxnOiEGqtPgU+OMyw7bY8C73FQi8rXGnOSFGX4RXU JCg3unxpK768PmzgJoCyhdqpU9PO7anTzsQlkb1Zocgk6alvi0SUTfYsSnVp7WM2x4Lp 9HCw== X-Gm-Message-State: ANhLgQ1SORnoBofLTLy7ZD9ecLhgKOFeXXtVA5RsVH/PgqIjhj0QdBCY MpO8exhbIia4SouZsC5PT1PL8ut1jqOpwBAvrfoe9VlIORmR4gSFwG/Bmsgj97vost/+tuAXh+d G5ySCAOWCYWHEVKUlA95e X-Received: by 2002:adf:df8f:: with SMTP id z15mr13208755wrl.184.1584738222392; Fri, 20 Mar 2020 14:03:42 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsV5OoSjpvvkCJkmiO+RpqFtdcg5TrbkRrR/6fCMecdsVlnOeTKdUw+ViwIY4tN/q2BhoiHWw== X-Received: by 2002:adf:df8f:: with SMTP id z15mr13208739wrl.184.1584738222095; Fri, 20 Mar 2020 14:03:42 -0700 (PDT) Received: from localhost.localdomain.com (243.206.broadband12.iol.cz. [90.179.206.243]) by smtp.gmail.com with ESMTPSA id w7sm10479668wrr.60.2020.03.20.14.03.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 14:03:40 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v7 4/4] xfs: replace mrlock_t with rw_semaphores Date: Fri, 20 Mar 2020 22:03:17 +0100 Message-Id: <20200320210317.1071747-5-preichl@redhat.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320210317.1071747-1-preichl@redhat.com> References: <20200320210317.1071747-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 --- 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 ++-- 6 files changed, 27 insertions(+), 103 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 dec66059b045..548f1b6e1a55 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 8df2c9e1a34e..b3664d818948 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); } /*