From patchwork Sun Jun 17 02:00:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10468233 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 26F93600CC for ; Sun, 17 Jun 2018 02:02:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 143CF28BC1 for ; Sun, 17 Jun 2018 02:02:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04AE528BDB; Sun, 17 Jun 2018 02:02:07 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham 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 8EEEF28BC1 for ; Sun, 17 Jun 2018 02:02:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5A386B0273; Sat, 16 Jun 2018 22:01:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AA7816B0275; Sat, 16 Jun 2018 22:01:06 -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 811356B0276; Sat, 16 Jun 2018 22:01:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id 2A3326B0274 for ; Sat, 16 Jun 2018 22:01:06 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id y8-v6so6640364pfl.17 for ; Sat, 16 Jun 2018 19:01:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=nftG592FglmKPNkS0O3i9Vic0KQckutXgqXmFPqt590=; b=Wa2tXabIbCSyVVa0JZMHFngeZXQKPNnTtBbe5FdVLH//bH2Dutha3qbFvRP7T3Kcqv MTVvb0v+Zh5YtY9qSQCU6E4tDyfvu+SeakQuUwxvn+afpe9WkMsI3b47scFuLntbV+sd +RaLiAYTjrluNykzvSYRlDsTG6U1HTU5ixOZPWoOBy6Ee0Cdfd9AIA0WKcjGYhms/uNq zofTV9Qzo7MvAzvoUE4E1D8/UY81RPP74GPr4/cGvXllas1UA7S+QjFFrVTGXXoWd6/I /gdb9p2tiU4CgKCJt0tBCJpnHglQjbTppkQ7Q7DbMNOZj6HDXZ3A6zbip2oFtWtr3CiF 3ZVA== X-Gm-Message-State: APt69E3445UT6t0FuNSXgf1QdOgwq8duDni4Qi7VFdfYB0Zx5Im7WrrX s2YgrE5KxQO9d81zPYvlX8nLWCQ/W3rZy0AkA4P84+egUqRyXGqbL3nvC8HxHep6W3vEjkZEern bpUOMW0nOCtprMBfWOwhKFzX37AmOIoKBuvObEzBd4x3C+a1+EkcWu53CjkNwxI6OXA== X-Received: by 2002:a17:902:343:: with SMTP id 61-v6mr8388127pld.344.1529200865871; Sat, 16 Jun 2018 19:01:05 -0700 (PDT) X-Google-Smtp-Source: ADUXVKItXMX0mZoZOvfRnrdpSo95W/v3fpkH++s3t8QibjYtGfWf6nmT15b+AiXPXsAVrtX1YDxa X-Received: by 2002:a17:902:343:: with SMTP id 61-v6mr8388088pld.344.1529200865205; Sat, 16 Jun 2018 19:01:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529200865; cv=none; d=google.com; s=arc-20160816; b=GKuYJSYHwy4Th5sASnvN1ciSft8t9SZWomvMd9Tus77SmTcDYlxsnv4gFtz3vGZioU J1bDQB/Xq+D5wux/MttbhF6XiwpOGfO3b4HIvRX6gORsW0hsOyflLHvhZbwitOj8ZHsX sWcyW4kL0vRq5eZBhk4icJGas2XfujZDYRi+xu/Q19oAxh97PJNCqmxnIAp0xB3xQ4Vm CdE0Oazs/BwYdA73AakzIiJ0Y+lgC5gwSlSsgOW0Uy0HXledDKHf68E2KLpdYJJWkSZ6 DqOrdQckzrZP/VgczbNj64+qpHjoZxQRj3ymdQSHkRf04VhxCPYf+tVEJe0RhLAXDSi2 MUWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=nftG592FglmKPNkS0O3i9Vic0KQckutXgqXmFPqt590=; b=SLwL7TmL8IX/sa9F+pIJ0HThtS7lRt4cl8pqRouunPkEYoo/AhOmDlALwkMHT0W3Ng 3F8AC4OIQipmeYmde8dA5k1QD1+NMCRkN/nhnfwBdDzrdHnK+IaVAFcZEGClP9sOvrcz EE/R1kurJjq98CuGz/7WFcxKLEPYgGXkeBKGlLgUN9pU4JA1OWKystWXint7gZlIS0p8 0/nOCFpi59+77iQN58w5ZhjddTVHPLCk6s2QegUdPyRzNMODPLz5F8MwZR5NwEsfzn8J /DceASB4wSiEYtcoZGTb8WTtbDR0Nw/fj6C0Qxq9nwgJZpr+/I8Kd25dKcSD1017Qa1j qwJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=CcFsLVjf; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id y2-v6si9652839pgr.677.2018.06.16.19.01.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 19:01:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=CcFsLVjf; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org 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=nftG592FglmKPNkS0O3i9Vic0KQckutXgqXmFPqt590=; b=CcFsLVjfPRyi1vknngu8RhDQ8 muB7aY4XhABG07Aog0tciv2jAAj+KgiMLi5p4zFe6qMimHLGhUgET3eDeUHWK18b87QRicc0bLHHJ hRys3NiUYJ665IgdlLKQmaO2xFNFTA6RF3LB0y/Ya9jwGKHmts8iRV+I0258DQrcioJZZ9Do+zdLo Nu+P5FbQ8EFn4blFG+ygkyaQD560JEjLv7sgINzBT2VY1zeN8ta+xZUf2I1XOD1P5oxMWvwpA/mFR K97JtgH0UjLe7lx+RWdLwM4j6xCv5kdJ9LKfHWgllsKYwCVFqb2JEMjVTGslTZGzE348aItwPzpgb TtUNgVr5Q==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUN04-0001L7-5o; Sun, 17 Jun 2018 02:01:04 +0000 From: Matthew Wilcox To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Jan Kara , Jeff Layton , Lukas Czerner , Ross Zwisler , Christoph Hellwig , Goldwyn Rodrigues , Nicholas Piggin , Ryusuke Konishi , linux-nilfs@vger.kernel.org, Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v14 37/74] mm: Convert truncate to XArray Date: Sat, 16 Jun 2018 19:00:15 -0700 Message-Id: <20180617020052.4759-38-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180617020052.4759-1-willy@infradead.org> References: <20180617020052.4759-1-willy@infradead.org> 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 This is essentially xa_cmpxchg() with the locking handled above us, and it doesn't have to handle replacing a NULL entry. Signed-off-by: Matthew Wilcox --- mm/truncate.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mm/truncate.c b/mm/truncate.c index ed778555c9f3..45d68e90b703 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -33,15 +33,12 @@ static inline void __clear_shadow_entry(struct address_space *mapping, pgoff_t index, void *entry) { - struct radix_tree_node *node; - void **slot; + XA_STATE(xas, &mapping->i_pages, index); - if (!__radix_tree_lookup(&mapping->i_pages, index, &node, &slot)) + xas_set_update(&xas, workingset_update_node); + if (xas_load(&xas) != entry) return; - if (*slot != entry) - return; - __radix_tree_replace(&mapping->i_pages, node, slot, NULL, - workingset_update_node); + xas_store(&xas, NULL); mapping->nrexceptional--; } @@ -738,10 +735,10 @@ int invalidate_inode_pages2_range(struct address_space *mapping, index++; } /* - * For DAX we invalidate page tables after invalidating radix tree. We + * For DAX we invalidate page tables after invalidating page cache. We * could invalidate page tables while invalidating each entry however * that would be expensive. And doing range unmapping before doesn't - * work as we have no cheap way to find whether radix tree entry didn't + * work as we have no cheap way to find whether page cache entry didn't * get remapped later. */ if (dax_mapping(mapping)) {