From patchwork Sat May 19 01:35:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10412477 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 19741600F6 for ; Sat, 19 May 2018 01:45:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10F8328926 for ; Sat, 19 May 2018 01:45:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05ABE289D8; Sat, 19 May 2018 01:45:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C99128926 for ; Sat, 19 May 2018 01:45:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63D826B06B1; Fri, 18 May 2018 21:45:17 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5EE086B06B2; Fri, 18 May 2018 21:45:17 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E0FB6B06B3; Fri, 18 May 2018 21:45:17 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 066D56B06B1 for ; Fri, 18 May 2018 21:45:17 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id e20-v6so5731734pff.14 for ; Fri, 18 May 2018 18:45:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=mYPwoW3XyG0ybs5UmYKkz4ZpfNraclcB9TJ5YJDxDjA=; b=O3TNYX7IyTwTXkggoEeag/IDtAbyLAEpWGg7e1D17yr+SAA4C9ZO7tntQYeEIdijdi ZU7vMsZIff2g0lEVx8Es7ebYq+V3QAsbzbLDQCByz0USUKCT5BsK/x7KG3sqPC2A6AQJ 2CNo0Ux00EiQAL1m/rEScqSV2whmQRxMkzJuqWsc0RecBYX7ZwE8RQe1I5n7iM4iEaoZ TJztxd2RaQO4VVKEki6ZP+tvFjeyOnvitTN1uo1zgvEh77ixxVqKx4aXIn3lutgl1lBC mElxOz9FhVO14kAj03W6W/gNBBiN8/FRWDvHYXLTV6vOy7R1u802e1xPLZ6Cg1wTPlco AHyw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: ALKqPwdyv7l6gdXoZiCwHSud70x3CdnIQorU+Wyta9A1gvG/dBl9sWy7 FIRrPFP43ZHzZu8ZV21VsDz5GLO7DmB8bpUOdKWEqsGw0C+KiCgiDpdBmkzkH1YElKAN9WjHqTa whkPeyGI+KBgzGYC337Cdq5HrDPUKhbyVArJoRDiBP9HEaIv4pa7YIutXHkmHS4FPwA== X-Received: by 2002:a17:902:8602:: with SMTP id f2-v6mr11686331plo.5.1526694316715; Fri, 18 May 2018 18:45:16 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrfRoB+5RUQLSGHfC978RAQE0UiB0yaK4THEZmjfPOh8OzCROusZVWxQ7hOsEVJakNH0ICA X-Received: by 2002:a17:902:8602:: with SMTP id f2-v6mr11686295plo.5.1526694315968; Fri, 18 May 2018 18:45:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526694315; cv=none; d=google.com; s=arc-20160816; b=tviC4EOyTZrDUT6Bzf1wknEK7xk3c6iUHpKG/hpp/EJv7pf0XULK8NQFfFv9712WaX Znf6QblA1YMet4R+oY3Pcz683Q4F6dulnaP1k5rJ3C5oeBeTIojr81kbjIXsebrW1Xp2 YSKZydRxfUE2SKSEKsxYrcpFoQ2PSYS+PNXtWS/YsuH1QbiBEJFTX50lRDasnebx9hRZ embyJEgKmql0i2HBp+P/vyYp/OHe00eGolmVEYUHAqkfpIhtEtTyhC1kAbzh2cxWsoeA gbxTi+M4GJ5gJc+jDjJKbf1leyhMiJQA5IBblSuLgMuQ510lUatVlk9183VbA+glc1k9 3PzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject :arc-authentication-results; bh=mYPwoW3XyG0ybs5UmYKkz4ZpfNraclcB9TJ5YJDxDjA=; b=oz7yIrh9lWGA3GeV2JTwUGlE9CHFM9mPk+IRvJHIj9ehHtnGiMVxlY+t/HlenCJlO8 9pDp5YApfx3E+flv9Vwxt/eu9lp46Cs5nW3jRwPX6nsr8Uwi9/LXgRZVP0drnpTJjckz Q4PAqJPHnNOD1DJzVRYChZ0mKbSjGtQ/J2DKdnMHJ+/e2DOba9hDLytutfm97k30Umlz AnjTMXGaVGuPI8fZemcV0HShi95dzQToB1wdXLx5RCoh2XVd019ImSvXpt2EDb/VZBRE 6ZDHN8R40M4VQ6YO7F3yjC27DAv9lT0X44PfOLnaJ8UvqBNJ54KanCuT2sNI/bh9O1OW jTJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga09.intel.com (mga09.intel.com. [134.134.136.24]) by mx.google.com with ESMTPS id 61-v6si8358170plc.173.2018.05.18.18.45.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 May 2018 18:45:15 -0700 (PDT) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.24 as permitted sender) client-ip=134.134.136.24; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 May 2018 18:45:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,417,1520924400"; d="scan'208";a="42488888" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga008.jf.intel.com with ESMTP; 18 May 2018 18:45:15 -0700 Subject: [PATCH v11 5/7] xfs: prepare xfs_break_layouts() to be called with XFS_MMAPLOCK_EXCL From: Dan Williams To: linux-nvdimm@lists.01.org Cc: "Darrick J. Wong" , Ross Zwisler , Dave Chinner , Christoph Hellwig , Christoph Hellwig , "Darrick J. Wong" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Date: Fri, 18 May 2018 18:35:18 -0700 Message-ID: <152669371892.34337.6984922688445598813.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <152669369110.34337.14271778212195820353.stgit@dwillia2-desk3.amr.corp.intel.com> References: <152669369110.34337.14271778212195820353.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP In preparation for adding coordination between extent unmap operations and busy dax-pages, update xfs_break_layouts() to permit it to be called with the mmap lock held. This lock scheme will be required for coordinating the break of 'dax layouts' (non-idle dax (ZONE_DEVICE) pages mapped into the file's address space). Breaking dax layouts will be added to xfs_break_layouts() in a future patch, for now this preps the unmap call sites to take and hold XFS_MMAPLOCK_EXCL over the call to xfs_break_layouts(). Cc: "Darrick J. Wong" Cc: Ross Zwisler Cc: Dave Chinner Suggested-by: Christoph Hellwig Reviewed-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" Signed-off-by: Dan Williams --- fs/xfs/xfs_file.c | 5 +---- fs/xfs/xfs_ioctl.c | 5 +---- fs/xfs/xfs_iops.c | 10 +++++++--- fs/xfs/xfs_pnfs.c | 3 ++- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 299aee4b7b0b..35309bd046be 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -734,7 +734,7 @@ xfs_file_fallocate( struct xfs_inode *ip = XFS_I(inode); long error; enum xfs_prealloc_flags flags = 0; - uint iolock = XFS_IOLOCK_EXCL; + uint iolock = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL; loff_t new_size = 0; bool do_file_insert = false; @@ -748,9 +748,6 @@ xfs_file_fallocate( if (error) goto out_unlock; - xfs_ilock(ip, XFS_MMAPLOCK_EXCL); - iolock |= XFS_MMAPLOCK_EXCL; - if (mode & FALLOC_FL_PUNCH_HOLE) { error = xfs_free_file_space(ip, offset, len); if (error) diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 89fb1eb80aae..4151fade4bb1 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -614,7 +614,7 @@ xfs_ioc_space( struct xfs_inode *ip = XFS_I(inode); struct iattr iattr; enum xfs_prealloc_flags flags = 0; - uint iolock = XFS_IOLOCK_EXCL; + uint iolock = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL; int error; /* @@ -648,9 +648,6 @@ xfs_ioc_space( if (error) goto out_unlock; - xfs_ilock(ip, XFS_MMAPLOCK_EXCL); - iolock |= XFS_MMAPLOCK_EXCL; - switch (bf->l_whence) { case 0: /*SEEK_SET*/ break; diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index a3ed3c811dfa..138fb36ca875 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1031,13 +1031,17 @@ xfs_vn_setattr( if (iattr->ia_valid & ATTR_SIZE) { struct xfs_inode *ip = XFS_I(d_inode(dentry)); - uint iolock = XFS_IOLOCK_EXCL; + uint iolock; + + xfs_ilock(ip, XFS_MMAPLOCK_EXCL); + iolock = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL; error = xfs_break_layouts(d_inode(dentry), &iolock); - if (error) + if (error) { + xfs_iunlock(ip, XFS_MMAPLOCK_EXCL); return error; + } - xfs_ilock(ip, XFS_MMAPLOCK_EXCL); error = xfs_vn_setattr_size(dentry, iattr); xfs_iunlock(ip, XFS_MMAPLOCK_EXCL); } else { diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c index aa6c5c193f45..6ea7b0b55d02 100644 --- a/fs/xfs/xfs_pnfs.c +++ b/fs/xfs/xfs_pnfs.c @@ -43,7 +43,8 @@ xfs_break_layouts( while ((error = break_layout(inode, false) == -EWOULDBLOCK)) { xfs_iunlock(ip, *iolock); error = break_layout(inode, true); - *iolock = XFS_IOLOCK_EXCL; + *iolock &= ~XFS_IOLOCK_SHARED; + *iolock |= XFS_IOLOCK_EXCL; xfs_ilock(ip, *iolock); }