From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-322982-1516221877-2-17025386967971806593 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enrosk.us-ascii, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-usb-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516221877; b=AgaC3d+Xmk+PwqNBEYCw1p6UYr2KNh7H7d3+IRL86k6zW/3 N+Lwf6U+oChPI3mAgsa1cb9HItohYdYZQgggF2lr9gW8iXPrQ+5+tHLKslaaPTbX vtZBFPhD0Y2C9zdl0N+f7wAGZJsD2byhKMLeFoo7Uk/NjuXB4SJiKdEgRWEn6oeX 6U3tIRqTaYeNWOZ04KVDm9fVbNn6CpTHZg/UnHQJ/t2pYOngYsWzrhrmzlY4QHRu 0MrQmq5zpOYo2qLHLASCsoDkW8EM5y5yp8ek+3fi2pH7GZvg5rLEYdCjYtY5qDRQ zP4rff+g0BJaryMv5gdDqLmOWngN3Rs8fwhvaQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1516221877; bh=X5DOWB8xp4LRaiVZ4mI4wUZP1PWiErbF0NdYsI3Hbrw=; b=dam6n23Vudjd Q7MG79NA3AQroJOUw5R1vF6espxxbtV2SjGkUYu7RQQXT8ZoazGceCLq+7e9u135 w6wlruS07ewXi1IGZEM5m5RaFz5E7j4z18o6ELwac+S/iplyY5/UsZNceMTmyNUy zSSPbqf4uaIRDdo/fwNtz34bkmXnwOJEcCRh/WOzeludEsxZKkVFm+1DDe4tnmhx W6ktMIZrjIgsyi1ZDc9uwx9SAAUcgiRcl15xtmvYb6QtTRwqw4yGWM+rCsXNQFks iMNRwEre7/abNyHq+o0qOrXQiMRW/Ufn/9JzQpgiRbL5QTSTJ2fBjiuu2PySxPIm U9ceScf/pw== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=UMVqCZ4n x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=infradead.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=infradead.org header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=UMVqCZ4n x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=infradead.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=infradead.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932201AbeAQUoc (ORCPT ); Wed, 17 Jan 2018 15:44:32 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:45645 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753694AbeAQUWu (ORCPT ); Wed, 17 Jan 2018 15:22:50 -0500 From: Matthew Wilcox To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nilfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-usb@vger.kernel.org, Bjorn Andersson , Stefano Stabellini , iommu@lists.linux-foundation.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, intel-gfx@lists.freedesktop.org, cgroups@vger.kernel.org, linux-sh@vger.kernel.org, David Howells Subject: [PATCH v6 57/99] dax: Convert dax_unlock_mapping_entry to XArray Date: Wed, 17 Jan 2018 12:21:21 -0800 Message-Id: <20180117202203.19756-58-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180117202203.19756-1-willy@infradead.org> References: <20180117202203.19756-1-willy@infradead.org> Sender: linux-usb-owner@vger.kernel.org X-Mailing-List: linux-usb@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Matthew Wilcox Replace slot_locked() with dax_locked() and inline unlock_slot() into its only caller. Signed-off-by: Matthew Wilcox --- fs/dax.c | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 5097a606da1a..f3463d93a6ce 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -73,6 +73,11 @@ fs_initcall(init_dax_wait_table); #define DAX_ZERO_PAGE (1UL << 2) #define DAX_EMPTY (1UL << 3) +static bool dax_locked(void *entry) +{ + return xa_to_value(entry) & DAX_ENTRY_LOCK; +} + static unsigned long dax_radix_sector(void *entry) { return xa_to_value(entry) >> DAX_SHIFT; @@ -180,16 +185,6 @@ static void dax_wake_mapping_entry_waiter(struct address_space *mapping, __wake_up(wq, TASK_NORMAL, wake_all ? 0 : 1, &key); } -/* - * Check whether the given slot is locked. Must be called with xa_lock held. - */ -static inline int slot_locked(struct address_space *mapping, void **slot) -{ - unsigned long entry = xa_to_value( - radix_tree_deref_slot_protected(slot, &mapping->pages.xa_lock)); - return entry & DAX_ENTRY_LOCK; -} - /* * Mark the given slot as locked. Must be called with xa_lock held. */ @@ -202,18 +197,6 @@ static inline void *lock_slot(struct address_space *mapping, void **slot) return entry; } -/* - * Mark the given slot as unlocked. Must be called with xa_lock held. - */ -static inline void *unlock_slot(struct address_space *mapping, void **slot) -{ - unsigned long v = xa_to_value( - radix_tree_deref_slot_protected(slot, &mapping->pages.xa_lock)); - void *entry = xa_mk_value(v & ~DAX_ENTRY_LOCK); - radix_tree_replace_slot(&mapping->pages, slot, entry); - return entry; -} - /* * Lookup entry in radix tree, wait for it to become unlocked if it is * a DAX entry and return it. The caller must call @@ -237,8 +220,7 @@ static void *get_unlocked_mapping_entry(struct address_space *mapping, entry = __radix_tree_lookup(&mapping->pages, index, NULL, &slot); if (!entry || - WARN_ON_ONCE(!xa_is_value(entry)) || - !slot_locked(mapping, slot)) { + WARN_ON_ONCE(!xa_is_value(entry)) || !dax_locked(entry)) { if (slotp) *slotp = slot; return entry; @@ -257,17 +239,19 @@ static void *get_unlocked_mapping_entry(struct address_space *mapping, static void dax_unlock_mapping_entry(struct address_space *mapping, pgoff_t index) { - void *entry, **slot; + XA_STATE(xas, &mapping->pages, index); + void *entry; - xa_lock_irq(&mapping->pages); - entry = __radix_tree_lookup(&mapping->pages, index, NULL, &slot); - if (WARN_ON_ONCE(!entry || !xa_is_value(entry) || - !slot_locked(mapping, slot))) { - xa_unlock_irq(&mapping->pages); + xas_lock_irq(&xas); + entry = xas_load(&xas); + if (WARN_ON_ONCE(!entry || !xa_is_value(entry) || !dax_locked(entry))) { + xas_unlock_irq(&xas); return; } - unlock_slot(mapping, slot); - xa_unlock_irq(&mapping->pages); + entry = xa_mk_value(xa_to_value(entry) & ~DAX_ENTRY_LOCK); + xas_store(&xas, entry); + /* Safe to not call xas_pause here -- we don't touch the array after */ + xas_unlock_irq(&xas); dax_wake_mapping_entry_waiter(mapping, index, entry, false); } -- 2.15.1