From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-331097-1516221913-2-10627587827232217419 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 unknown, 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=1516221912; b=kMKmGsXu/nTMtjeDSpAJmUucU1jvRVT1buojixRf9DODn1N KQ7ZNNg7QfDKti3ygWnMgQv4xgD0ccrHyZnyOBS0ILDMIVb/qfhB+eiiV0Uz4zhQ G2+O5N1loE4CZ/GlYn0kffzwudTfh7olzp1OjlUdcLb51SJQjGtu+CaEKy3D/+of DSSGMJ7TtbGD2y1zxJsXxaq4IRDWl4ON8qinZPcwAmIa5HDtIANSHjgJm7oS5Yd0 e910knLjHW3biYBmEz3TwzeqDqKKpPfHEbCRn5DfOF4PNZySuYFZppIJya5NtOV2 9aex3hj+xrhfLbiuwsBkhQa9PLyZnc4LRnDsQbg== 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=1516221912; bh=izdW/SmDTHw/dcl7uBgtwJikaSK+F5xa5i+EX0YIT2E=; b=P3B2OKS8mgRK uZkMGCJkGhtm70D1oklGEZCTR3GU2Y7nwR/GExUU50OnXPXD3o0UVJW6iFHnsiJ2 YeyQIsESioqCokrIeK0HKYszDXjjF1nVf+1FDg/6ZzepvVElUZTEOAgNlWclhUrr mWKZcXRG+R4i3lvugmPgkRjj3waDdv313jc06ZDxSYZxMWoHs7J6z+uYTr25XcVm 8jlQ5E2+XDZ12BN/7I53ljfKQkzYZGYbXBUd0uIGg7LMc7gu8C0FRxwCrPTOfNe8 jL4IADX3VMEZ6yNvrrcNlCMCs42SnHcjdP5UTtDQNGxg/hcb+R6pYcE3RhLMTKU5 Nj+jD6Pmdg== ARC-Authentication-Results: i=1; mx1.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=SGg8S7Mm 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: mx1.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=SGg8S7Mm 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 S932131AbeAQUob (ORCPT ); Wed, 17 Jan 2018 15:44:31 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:54997 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753701AbeAQUWu (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 58/99] dax: Convert lock_slot to XArray Date: Wed, 17 Jan 2018 12:21:22 -0800 Message-Id: <20180117202203.19756-59-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 Signed-off-by: Matthew Wilcox --- fs/dax.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index f3463d93a6ce..8eab0b56f7f9 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -188,12 +188,11 @@ static void dax_wake_mapping_entry_waiter(struct address_space *mapping, /* * Mark the given slot as locked. Must be called with xa_lock held. */ -static inline void *lock_slot(struct address_space *mapping, void **slot) +static inline void *lock_slot(struct xa_state *xas) { - unsigned long v = xa_to_value( - radix_tree_deref_slot_protected(slot, &mapping->pages.xa_lock)); + unsigned long v = xa_to_value(xas_load(xas)); void *entry = xa_mk_value(v | DAX_ENTRY_LOCK); - radix_tree_replace_slot(&mapping->pages, slot, entry); + xas_store(xas, entry); return entry; } @@ -244,7 +243,7 @@ static void dax_unlock_mapping_entry(struct address_space *mapping, xas_lock_irq(&xas); entry = xas_load(&xas); - if (WARN_ON_ONCE(!entry || !xa_is_value(entry) || !dax_locked(entry))) { + if (WARN_ON_ONCE(!xa_is_value(entry) || !dax_locked(entry))) { xas_unlock_irq(&xas); return; } @@ -303,6 +302,7 @@ static void put_unlocked_mapping_entry(struct address_space *mapping, static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, unsigned long size_flag) { + XA_STATE(xas, &mapping->pages, index); bool pmd_downgrade = false; /* splitting 2MiB entry into 4k entries? */ void *entry, **slot; @@ -341,7 +341,7 @@ static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, * Make sure 'entry' remains valid while we drop * xa_lock. */ - entry = lock_slot(mapping, slot); + entry = lock_slot(&xas); } xa_unlock_irq(&mapping->pages); @@ -408,7 +408,7 @@ static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, xa_unlock_irq(&mapping->pages); return entry; } - entry = lock_slot(mapping, slot); + entry = lock_slot(&xas); out_unlock: xa_unlock_irq(&mapping->pages); return entry; @@ -639,6 +639,7 @@ static int dax_writeback_one(struct block_device *bdev, pgoff_t index, void *entry) { struct radix_tree_root *pages = &mapping->pages; + XA_STATE(xas, pages, index); void *entry2, **slot, *kaddr; long ret = 0, id; sector_t sector; @@ -675,7 +676,7 @@ static int dax_writeback_one(struct block_device *bdev, if (!radix_tree_tag_get(pages, index, PAGECACHE_TAG_TOWRITE)) goto put_unlocked; /* Lock the entry to serialize with page faults */ - entry = lock_slot(mapping, slot); + entry = lock_slot(&xas); /* * We can clear the tag now but we have to be careful so that concurrent * dax_writeback_one() calls for the same index cannot finish before we @@ -1500,8 +1501,9 @@ static int dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn) { struct address_space *mapping = vmf->vma->vm_file->f_mapping; - void *entry, **slot; pgoff_t index = vmf->pgoff; + XA_STATE(xas, &mapping->pages, index); + void *entry, **slot; int vmf_ret, error; xa_lock_irq(&mapping->pages); @@ -1517,7 +1519,7 @@ static int dax_insert_pfn_mkwrite(struct vm_fault *vmf, return VM_FAULT_NOPAGE; } radix_tree_tag_set(&mapping->pages, index, PAGECACHE_TAG_DIRTY); - entry = lock_slot(mapping, slot); + entry = lock_slot(&xas); xa_unlock_irq(&mapping->pages); switch (pe_size) { case PE_SIZE_PTE: -- 2.15.1