From patchwork Mon Oct 5 21:38:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11817789 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 7E2AE112E for ; Mon, 5 Oct 2020 21:39:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58FA9208C3 for ; Mon, 5 Oct 2020 21:39:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bWC7PaBR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726692AbgJEVi7 (ORCPT ); Mon, 5 Oct 2020 17:38:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47337 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726685AbgJEVi7 (ORCPT ); Mon, 5 Oct 2020 17:38:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601933937; 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=TOh0YDpvNjX+rcObXo523OUYbm/24DDF2+v1+gMlk9E=; b=bWC7PaBRnGIjXLW45B+5FgTSDAZ2Jiz8/E/RVG6oyI6Z5sf5B5+iycQMONX3Pqog5Ib/lv pp3Prjcs6ziDnf6fKuGNbsFvSs0vXIpg+SUeTOKVZgrvX5XnccHcj3HafaOIGTL5c7tFtb Iy9bY3PlfHVCg0vEGlis3vNmMZw1iRI= 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-393-SaY9npiONMms4HUcXfUwKg-1; Mon, 05 Oct 2020 17:38:56 -0400 X-MC-Unique: SaY9npiONMms4HUcXfUwKg-1 Received: by mail-wr1-f72.google.com with SMTP id d9so4500367wrv.16 for ; Mon, 05 Oct 2020 14:38:56 -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=TOh0YDpvNjX+rcObXo523OUYbm/24DDF2+v1+gMlk9E=; b=QBdZiUhU9DHy8jywc01blmbYRcztNhLy2ngtLgVLycR0wJrpOnLAYbYdIm4+LSk3ir tuSSI0nNPtzP37pBmeGB2U7rYM1jaxqk6yURVEvYi25UH9hT44Cu1TV6ciJf6MeUhL80 TbzhDf1ox6qUfRwnJxS2O4WJHZGgwRcfUK54iqZsN/ebvScel6yAtzkwP7El0jY1+v6Q Vc3xag/RDk09A7x6Zh9Yv5d1BkU+YXv0sdhAe/jmPgYpBXzwMZiWam79nUNaBFQdE9Q1 SGCG2nqqNzeFyd/W3oJhj2PK4Q3YhLiKWCjukaGZjU6CbJdLKqPdueYgnqONwZ5mS8cG g9Pg== X-Gm-Message-State: AOAM531pOnSHMa9uZiFwsZUQfpMJRvagSENmwfP+Rm3DisK3rDPfPkkk +74bExHwallq+GZy0tHgIzQkVWjYxasZiPxSb77p9M2VBuDRZ1bOfsepQ7KMaLWArnK6YYZlDfb YRKODgOkgyIwOUDDxy6GH X-Received: by 2002:adf:f10e:: with SMTP id r14mr1269505wro.337.1601933934626; Mon, 05 Oct 2020 14:38:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMJXsNc8Iq/oF3icoV7ljKTt4Lk/xBmhVT2Y6Vmkp5hq9EzpBQCBoYF1/E54phYI+GPHMw/A== X-Received: by 2002:adf:f10e:: with SMTP id r14mr1269489wro.337.1601933934428; Mon, 05 Oct 2020 14:38:54 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id r5sm1576499wrp.15.2020.10.05.14.38.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 14:38:53 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v8 1/4] xfs: Refactor xfs_isilocked() Date: Mon, 5 Oct 2020 23:38:49 +0200 Message-Id: <20201005213852.233004-2-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201005213852.233004-1-preichl@redhat.com> References: <20201005213852.233004-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..1f39bce96656 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 Mon Oct 5 21:38:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11817791 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 C5074112E for ; Mon, 5 Oct 2020 21:39:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FB362083B for ; Mon, 5 Oct 2020 21:39:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OExfUQXP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726698AbgJEVjB (ORCPT ); Mon, 5 Oct 2020 17:39:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41898 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725616AbgJEVjA (ORCPT ); Mon, 5 Oct 2020 17:39:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601933939; 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=nlqRPbcwPd/Uky8ewakSE96Ze9oxdn4UrbS50VrTO3E=; b=OExfUQXPAAucNvFTlhXa2fB7MAT6kPcM4rQR6HD2kHTgK1DGkrzXgFKBk9Kl5kNnDAZrA/ 03b21Th2NBf1ytB1vdERxNLOc3d2LVTFbnAhnfTHF9vd2KeSKqU3CtGA4veHGTI/YKf4Vz 8JjN5+JpknHpqE/ZzsxiduVfNlDeS5A= 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-434-SfcbC46WNu2Eao94WNO-rw-1; Mon, 05 Oct 2020 17:38:57 -0400 X-MC-Unique: SfcbC46WNu2Eao94WNO-rw-1 Received: by mail-wm1-f69.google.com with SMTP id z7so333669wmi.3 for ; Mon, 05 Oct 2020 14:38:57 -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=nlqRPbcwPd/Uky8ewakSE96Ze9oxdn4UrbS50VrTO3E=; b=Pn1xTfvOIiYXelaYhrd+I0raDWJ3/51fcXIWsGkmj7RWBDw+7GaTjkBG+1RJtZUtt/ NlY8KiSntaS1GzlrjKWCFaUh8+f+Zlzd43aICRT/cyxJyJx6Hi/DBkuosRNzH+GfQh8q 7kddWcXE0io2C8q42RboMSF5n/3444qkTzwkjgQa/Xz4vKFbgbF7/PXNbyurzn4ktnY6 jAO2SjiFx0s6oSa5kGdmsbz/5fnZMvLwATUzSeoluVgqGA7yeuZysTse8ScKn1VKRdIN +zPcK749VtA36/y7MjDeCGftmfT5rBcR1aHcAI3HsKsDJIgQEOob7pgAQHb8X7OpUZjm ee0Q== X-Gm-Message-State: AOAM533MXT9GT/rrWF5iRZDSoIFYsdkNulQoMt+bdWHaltzQ1cL/t1sA LRdwEGhJEgIueEO4UedlcMnSwddC7TiEU2iwA6AZnY76GjArA/I8R0ctEfMCj+wXM+ImNSDtIPZ eIgKem/G7DINVL5+cibgT X-Received: by 2002:adf:e488:: with SMTP id i8mr1465107wrm.116.1601933936260; Mon, 05 Oct 2020 14:38:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5KzY5Dc602/9I9zYyz6o38QOGUpAjupfwQLHZ2McbGel6fcZt55tmRLQ8yQQ5l3RmOi+9rA== X-Received: by 2002:adf:e488:: with SMTP id i8mr1465098wrm.116.1601933936041; Mon, 05 Oct 2020 14:38:56 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id r5sm1576499wrp.15.2020.10.05.14.38.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 14:38:54 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v8 2/4] xfs: clean up whitespace in xfs_isilocked() calls Date: Mon, 5 Oct 2020 23:38:50 +0200 Message-Id: <20201005213852.233004-3-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201005213852.233004-1-preichl@redhat.com> References: <20201005213852.233004-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 1f39bce96656..49d296877494 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 Mon Oct 5 21:38:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11817793 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 319871580 for ; Mon, 5 Oct 2020 21:39:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11470208C3 for ; Mon, 5 Oct 2020 21:39:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dvp9/VP3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725616AbgJEVjB (ORCPT ); Mon, 5 Oct 2020 17:39:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:40251 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726685AbgJEVjB (ORCPT ); Mon, 5 Oct 2020 17:39:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601933940; 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=JOggIbMhWLASLR12VW4Ix4Ht18K8U1KrcchbvqrMHVw=; b=dvp9/VP3V4nDekLFzi2COLish8YRZr0nrPRHfmqiQ1jFOajo194jYhByiP4TDq2XzuoQTm NxPw5jMev0u5YqDtaSQpLKvHFJVWuvBPKCiO1c07Brmp4t7rcCDnkcziAhJOqSCarNvzSn X1UspGHcfFJlyLggtnqhsInJ+Hn5pW8= 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-16-vm6IQvXTM9yF9iSwgHfqNw-1; Mon, 05 Oct 2020 17:38:58 -0400 X-MC-Unique: vm6IQvXTM9yF9iSwgHfqNw-1 Received: by mail-wr1-f71.google.com with SMTP id r16so4480480wrm.18 for ; Mon, 05 Oct 2020 14:38:58 -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=JOggIbMhWLASLR12VW4Ix4Ht18K8U1KrcchbvqrMHVw=; b=p5DQT71+y9/HznhmWB3zWz9ofB09V3S5LzOrfRzKyL0eMHKImMMZ6njAiUB+y8b51i e7MwEa35SRI1uipbzPbrAZ2AEx1MZFnNqCgDSPkfUzbZ1L5VaLQyKIVJBhfX5iruCNIX yM4dIWM95mI8Visdo9oJXNG+0xNpaSE9EEXQ2ncSKmqcF5F1Xrtg3YCv/7V1Ccl44OJ6 CZPAp3P8GrpgRseXghGWXINdHtLEsRMJvSifz4rLcroZp48h7AZRC173TV6oNn2RjtyU ykx2dOuanhl/H1b2jRSnSrR31ykzvFg85+d69SqRZjpGxhudl+NW7N2zMM/zW2ikOoA4 do2Q== X-Gm-Message-State: AOAM533bLCvRyO8/BSRAKyGMKf6HiaOMRy037tt35sYpP/zFWhqYbjMl ydVA+MdCyY9nbliS9+jvJ906+N4ad8qFvoeYUIbp+qs7NTyeGnSA1MlkQ4WxXhb21vkGBYvrgm+ 9au0FcC9J87+GH2CKryNm X-Received: by 2002:adf:ce01:: with SMTP id p1mr1273711wrn.33.1601933937032; Mon, 05 Oct 2020 14:38:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOP4mKnEF+umbSySiU0tLbNMtH7nfF/kOA/V79T85HEcuHQ2lEHpS9HoybfnHFhlWzoTVdzg== X-Received: by 2002:adf:ce01:: with SMTP id p1mr1273701wrn.33.1601933936878; Mon, 05 Oct 2020 14:38:56 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id r5sm1576499wrp.15.2020.10.05.14.38.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 14:38:56 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v8 3/4] xfs: xfs_isilocked() can only check a single lock type Date: Mon, 5 Oct 2020 23:38:51 +0200 Message-Id: <20201005213852.233004-4-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201005213852.233004-1-preichl@redhat.com> References: <20201005213852.233004-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 Mon Oct 5 21:38:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11817795 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 3AF2413B2 for ; Mon, 5 Oct 2020 21:39:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09FDF2083B for ; Mon, 5 Oct 2020 21:39:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="geMSbw9T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726685AbgJEVjD (ORCPT ); Mon, 5 Oct 2020 17:39:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55839 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726693AbgJEVjD (ORCPT ); Mon, 5 Oct 2020 17:39:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601933940; 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=B2naLBIfpEWa5yk+wORMESIqi2vsca2gmo21A9qN4Cs=; b=geMSbw9Tyh5Ezy/F5HodgfRWF9tfpjQjD4Mn+Gyf9RrF6xWtHUriqkunttB/BsMstRgSzQ xurwUCJ/lqLyZA1PCbBCI/Z3JgliXEDZoFmr5iH2yY/J/+ko+Kya5Q5uO8japrVrZix0t9 BhKp4n7TrjDVO5eUDz2b7T5yjYecXK0= 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-101-UHIInXFXO3-Gau_T2X1QAA-1; Mon, 05 Oct 2020 17:38:59 -0400 X-MC-Unique: UHIInXFXO3-Gau_T2X1QAA-1 Received: by mail-wm1-f69.google.com with SMTP id c204so328961wmd.5 for ; Mon, 05 Oct 2020 14:38:59 -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=B2naLBIfpEWa5yk+wORMESIqi2vsca2gmo21A9qN4Cs=; b=KCXuDYcYrh2BF/nSoR5tRpuaqzQeMr01FFrxDNvVmKYOI1dg+bgksK44CDt+6VLEok AwI+Hylp2Kjj2LEvZ34ZDcrvv22dOIRwznUogJ84uGibY1OS332Ht59aWPvYl9VWGXeP NwR4UQCwCwDzSb4BplCIxaTpJ4KeIH24n3paclcfct9hfilaUIO3cXtxcWaRa1ZwCMmE oR4YsDYIMZBTMmxVGtPDznmVGnq747Sq9Hd1KWPGEtblBdAY2jZopBQJZrIfNoLV2ptI 3NkwhC+eInpqjxIK0T+q9P/AwUhhdaH/cUCV1N/nMr5bHipZ/2iex1to8VTSJdjA4o3w 60TQ== X-Gm-Message-State: AOAM532Y8/MxjcpR1iNYZVMtNdvMPgr1Cw4Mn7RC2DFrPHP/rPsldnDc C0ILSJd3chh+Poq9j0iTrAlJHL4nO0IcTzdpJaKQCr0J+TSxq866zhnzmBDXNF7xFnwwl+hUmCs mx0Si2s9jQIRIPIB6akd+ X-Received: by 2002:adf:fac8:: with SMTP id a8mr1339113wrs.186.1601933937872; Mon, 05 Oct 2020 14:38:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+V/t+fBS/a/MJ426wbuCAOK6SrbRvsgd7YHfVoATuC7GZZbAh6ETqPnft2mXLKfVIo9pWVg== X-Received: by 2002:adf:fac8:: with SMTP id a8mr1339096wrs.186.1601933937624; Mon, 05 Oct 2020 14:38:57 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id r5sm1576499wrp.15.2020.10.05.14.38.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 14:38:57 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v8 4/4] xfs: replace mrlock_t with rw_semaphores Date: Mon, 5 Oct 2020 23:38:52 +0200 Message-Id: <20201005213852.233004-5-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201005213852.233004-1-preichl@redhat.com> References: <20201005213852.233004-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 | 10 +++++ 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, 37 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..d798d288eed1 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,16 @@ xfs_btree_split( args.done = &done; args.kswapd = current_is_kswapd(); INIT_WORK_ONSTACK(&args.work, xfs_btree_split_worker); + + /* Release the lock so it can be acquired in the kernel thread which + * executes the xfs_btree_split_worker. + */ + rwsem_release(&cur->bc_ino.ip->i_lock.dep_map, _THIS_IP_); queue_work(xfs_alloc_wq, &args.work); + wait_for_completion(&done); + /* Re-aqcquire the lock previously released for the work queue. */ + 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 49d296877494..dbc1b80629c5 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); } /*