From patchwork Wed Jan 17 20:21:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 10172593 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 C8C1660230 for ; Thu, 18 Jan 2018 09:43:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9F1125D99 for ; Thu, 18 Jan 2018 09:43:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE9412623D; Thu, 18 Jan 2018 09:43:06 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4BC2B25D99 for ; Thu, 18 Jan 2018 09:43:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CFDAF6E402; Thu, 18 Jan 2018 09:40:02 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9DC776E3A1 for ; Wed, 17 Jan 2018 20:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Z+ajj2wD4YsebV2T4CDiyg/K740zitLZXJd3yaYAxYY=; b=UMVqCZ4n3BWUCchehQooIWPkX ZCiiy2jJhqKy20/XNvSQscnRanbBFcaIukqaaKiFosQ9OQ6fMLDRoZ4vqSQ9rwe8qOXdnfT8RUX7J 6vRocjbGPfi2TPOxYT59fkk/V461FEeBtMJt4jejA3FGwgDVGe4NSNDJQeHeiWu22BVJKTXi5D7Gd aUGDbRvfBUU2riSNU62oM85fM4tj3iIDRN/f6I8nW9UQfxKSh6eL497AkcKZqMIZcIKQu9c6+4uhf GXulDCD184rM846aa+IMjb3t1hwA7cj8qPgvx1ZpKoZ/Y0X/EW80nSejmUWSDl7AkWgGU27en3xyq HkMlGTFCg==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1ebuES-00062n-TG; Wed, 17 Jan 2018 20:22:48 +0000 From: Matthew Wilcox To: linux-kernel@vger.kernel.org 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> Cc: linux-s390@vger.kernel.org, David Howells , linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-sh@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-usb@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org, Stefano Stabellini , linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, Bjorn Andersson , linux-btrfs@vger.kernel.org Subject: [Intel-gfx] [PATCH v6 57/99] dax: Convert dax_unlock_mapping_entry to XArray X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP 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); }