Received: by 10.223.185.116 with SMTP id b49csp4142052wrg; Mon, 19 Feb 2018 11:56:49 -0800 (PST) X-Google-Smtp-Source: AH8x224kWH6WCJArf3owiPargUqE36hXgMoJys3y7cjVLitrB1OfHQmwZBylaLf6KWcySx0Z7ZvN X-Received: by 2002:a17:902:1486:: with SMTP id k6-v6mr15603161pla.376.1519070209163; Mon, 19 Feb 2018 11:56:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519070209; cv=none; d=google.com; s=arc-20160816; b=kyM1b88zo+/BFqlTQj8ynjemfPpGv/O3kvl+nwNm6KefwnzeoINzNwMnSSyVj7W6y2 X7A65qh8q9ozByF5Ec0BuyLBZRaQxRaengNhz9og19bSgcwU7QJqLVwngjfHkpwEv1rx 5nxhG36/7EGetT8JBdFF6EA0ldvjfmLft6Q1Xz+faDF4mCHyh+s8qTRKBig2fvVTrx+t t7jZWdO7LSkmV3qpLhtOlvXU6l5A3R2HoKyBZGxV4UcfKl9k2EnuRPQZfM9It/R5DRSO EXLdaA4kwzJb2MLdmEXY1miI2e6qM3XYjtqpKTD7/u6e8n4XlA6tpIZrGDCKbA83QqYx HflQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=a7OdpLGx9aHCqe+0ottu9IjOFjhDtgBlUqsQJV+xTG0=; b=kVQKyY+VJEK+8BlQ1ue+51ASlbsckWeB1+ZGuRdttoSAWpPh0o0RbCXWx393wn/KIX 5jPKYpJlEs+wLGH5+3xoSHf5t9xPQrNC4GveK202ZXGu8AKRy35NAQrjo9XLuscKWk+O PyQfdgsZoHqulleZzE3VlI+jRHlSCSTgQcxyrQDtZM4uFZll8Qkdt+UuddUN651vgZWN an/Z/cUAF/C+BrDhYaLl0/h/yNb9i1LAUgBTdXtLQ5UUMR6ndFvFW3fuE3162uDYOagJ 0orH8pXvJq2ekROoJg31/Rs6eZS16lKpaBQNGuTMnn9wTDAQK8IRLmVwoIfurljNb2PT 416Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=PTI4/eLN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g24-v6si2495778plj.251.2018.02.19.11.56.34; Mon, 19 Feb 2018 11:56:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=PTI4/eLN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753961AbeBSTzb (ORCPT + 99 others); Mon, 19 Feb 2018 14:55:31 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:44838 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753733AbeBSTqU (ORCPT ); Mon, 19 Feb 2018 14:46:20 -0500 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=a7OdpLGx9aHCqe+0ottu9IjOFjhDtgBlUqsQJV+xTG0=; b=PTI4/eLN8+Uvc5i/nCiOqh6Zs 3LOjudk29d/YvHNWFQGUuPXEx1UnYbdkqaPvFcjI1NYY0SaP2ecEmQVWJKg2zoSQ3LFqLBAXxryA7 ZRv7qnk5obAORccTgALpAqbKIg7dJgJe5phNJKC1T0d2fHHXexotVkSMOeVUbb6gKlRqWttpqEHV7 6dK98baBxkqxdjqULWiqUmrOwxywUUdGayLq21CSQej9l5hB8Lz0RU4ahL74zD1chVrfmk0tgQctv 1qYRZsnjOCIriqxBZHEtOoKnv8GiAvfF49Za0JNUmwcMhbz+K+XNz7jYiVFZt/ruNDb6tTgoyMI4s 23Xm3vFLA==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1enrOF-0001rV-2V; Mon, 19 Feb 2018 19:46:19 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v7 35/61] mm: Convert truncate to XArray Date: Mon, 19 Feb 2018 11:45:30 -0800 Message-Id: <20180219194556.6575-36-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180219194556.6575-1-willy@infradead.org> References: <20180219194556.6575-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox 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 3fe1e7461684..9267c1a12a31 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->pages, index); - if (!__radix_tree_lookup(&mapping->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->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)) { -- 2.16.1