From patchwork Sun Jun 17 02:00:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10468287 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 7DDB460535 for ; Sun, 17 Jun 2018 02:03:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D3D028C6A for ; Sun, 17 Jun 2018 02:03:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6041D28C75; Sun, 17 Jun 2018 02:03:18 +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 EB81F28C6A for ; Sun, 17 Jun 2018 02:03:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B22E46B0286; Sat, 16 Jun 2018 22:01:17 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A587E6B0287; Sat, 16 Jun 2018 22:01:17 -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 8D8876B0288; Sat, 16 Jun 2018 22:01:17 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 3E4046B0286 for ; Sat, 16 Jun 2018 22:01:17 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id p29-v6so6685787pfi.19 for ; Sat, 16 Jun 2018 19:01:17 -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=3dt1i9NP1EXxETQ4D4nD6mkkx/fkw3evvLQHvoVxbqY=; b=cNQDnA87zFLzeDr9dlB7hvzZmzn5Vg3ZK/3YebJPuPUS1RHQMg8F7IYgOy4uNN049p MaIrAVhGzPI/qPP3xLjvyLmouEdvY4o/6eX1ESGfH5tM6w5wxEyHwOhFJ0MQaSFfUHxc GGLObmCWCm4Tf9U43w3pj9IYa9E6M2gJGpqB76xkkh21+bKsEGmAoegPlkCKyaqmTpNP Qhc+Dj7lHWJavVntXB+4Hf/fN2jTsER3UxxmxbfYVMz1D0eVzD6/dIT+iAmU+GX0DTLJ WayfxXWzW6eTnTtrpWQRnHBvyUvPqtTRt0P6fSTzx7s5CjffhM9n0vNmvm0izM9NaYvb PrjA== X-Gm-Message-State: APt69E19hhXjgQMdye8gX/vk4H+lmewwJRRQq3xykDGIiCxqxr107MuC XGfF7vgz+JMxkzlFcfBUPNPhmYVJtiH4DG2OotozAc3thynu2YZB+b4wuV3mSW3hvdMA4fns7fd /oZsgNPrvMJ24faHU46Etf890pYSAGvz/0YqcAxg8GBti7w25GN07ItL4HfSVSSeWxA== X-Received: by 2002:a62:ec5b:: with SMTP id k88-v6mr7908907pfh.85.1529200876936; Sat, 16 Jun 2018 19:01:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL+griGR4aNP479kkqHj7uxS1n1/JIU+FfzGJGfLGr8t1P1HoTAf36uW0oJAmDELwrmyxex X-Received: by 2002:a62:ec5b:: with SMTP id k88-v6mr7908876pfh.85.1529200876174; Sat, 16 Jun 2018 19:01:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529200876; cv=none; d=google.com; s=arc-20160816; b=pBSGq3qUrbn8hxsL3+9MweAds78CcE+JRxOOBiMUOWZkLIPORxWxdcd4D6p8k6V7gG 8IkwIBKFz51S6alxQjkeSZF6vcHAiFVrvmKjlI50cQKnzPvHHOja08K6ntZxnf0Gnyi2 nPi+hwsqwvfhwbOpfdYou3THbwYtNiNMaeOLb1/ybQgAnQ/YNzA/Fq/6Y3qWhdlIqmsM dG8S1elGewPVnbF5Wo0H6GRXOg9NbVZ06e0Hf/Ekg/Ph2I327AyEhzTAGXU3WMsKel9m ghJ6AIvdugmtM4pqqciRk73QIxIjqzVOyk2yzM4LuIbDs5aCLm+3BHVa47cpLvD37a57 Gofw== 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=3dt1i9NP1EXxETQ4D4nD6mkkx/fkw3evvLQHvoVxbqY=; b=EFS+XTC/WDRKKST2GPukWFqGUpVfMauoKjcutHi2wqRmYPoCf9ujOtjSIb87rvqD7i THnQUSzTANXTmkE5kVOpOEwV6guyCcxHUAvwnEHwctB68RseGNer8aGAoGQw29kGKiRj 80gSRS4FqGmlekpmBvWbgD9iVuFih8CgV4B8UgnYv5mv+h1uAQr6Pd9Wtrb5gl4tv1o+ p73s9h2YMWBY6uobvu2/MfRb8B/UBYamhIhxRlt4+SFRhzJSPuU/WM68fhIDnRm41Ydu rXjZVG9GmB+LmkA2Yg+rybDzwW40v6gGiKgVXlcRNrD/2B8JKwdy5qp+tOrwsI4DGeeB LMpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=hBhoTyth; 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 c3-v6si11433858pld.87.2018.06.16.19.01.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 19:01:16 -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=hBhoTyth; 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=3dt1i9NP1EXxETQ4D4nD6mkkx/fkw3evvLQHvoVxbqY=; b=hBhoTythSko0pFY65cmmmSvgH k2HXrqUZ3It06bxZLbP7ijoSrRGWitmutjXTJjSfEIh/TXudmVVJCox6fMusITIZRrLbt0BM/toUB wQV2ThXABL0BEAUAZxy4SKjGCeKLU/M4k9EBHd1u+G7r0ud03kQYqSAniHfKkfsmx9rfQxWhJ3PVW ZfYMttSmUwDZWba0W5tMCQU7tkUNyFbjSmDt3fHI8Ah9GJaEqt9wuHSBUynvZVteNowLlgFFZ/IGA lVwubIOV2QQ3nwZu0pXN/riLYUln9uL77TLx7Kd9ODbWvQrW2Q2lk8l6zqGAmtgo2zT1pfO65DeHC rIr54DZvg==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUN0C-0001SF-Af; Sun, 17 Jun 2018 02:01:12 +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 55/74] memfd: Convert memfd_tag_pins to XArray Date: Sat, 16 Jun 2018 19:00:33 -0700 Message-Id: <20180617020052.4759-56-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 Switch to a batch-processing model like memfd_wait_for_pins() and use the xa_state previously set up by memfd_wait_for_pins(). Signed-off-by: Matthew Wilcox Reviewed-by: Mike Kravetz --- mm/memfd.c | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/mm/memfd.c b/mm/memfd.c index e7d6be725b7a..636de8d5c7c3 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -28,37 +28,29 @@ #define MEMFD_TAG_PINNED PAGECACHE_TAG_TOWRITE #define LAST_SCAN 4 /* about 150ms max */ -static void memfd_tag_pins(struct address_space *mapping) +static void memfd_tag_pins(struct xa_state *xas) { - struct radix_tree_iter iter; - void __rcu **slot; - pgoff_t start; struct page *page; + unsigned int tagged = 0; lru_add_drain(); - start = 0; - rcu_read_lock(); - - radix_tree_for_each_slot(slot, &mapping->i_pages, &iter, start) { - page = radix_tree_deref_slot(slot); - if (!page || radix_tree_exception(page)) { - if (radix_tree_deref_retry(page)) { - slot = radix_tree_iter_retry(&iter); - continue; - } - } else if (page_count(page) - page_mapcount(page) > 1) { - xa_lock_irq(&mapping->i_pages); - radix_tree_tag_set(&mapping->i_pages, iter.index, - MEMFD_TAG_PINNED); - xa_unlock_irq(&mapping->i_pages); - } - if (need_resched()) { - slot = radix_tree_iter_resume(slot, &iter); - cond_resched_rcu(); - } + xas_lock_irq(xas); + xas_for_each(xas, page, ULONG_MAX) { + if (xa_is_value(page)) + continue; + if (page_count(page) - page_mapcount(page) > 1) + xas_set_tag(xas, MEMFD_TAG_PINNED); + + if (++tagged % XA_CHECK_SCHED) + continue; + + xas_pause(xas); + xas_unlock_irq(xas); + cond_resched(); + xas_lock_irq(xas); } - rcu_read_unlock(); + xas_unlock_irq(xas); } /* @@ -76,7 +68,7 @@ static int memfd_wait_for_pins(struct address_space *mapping) struct page *page; int error, scan; - memfd_tag_pins(mapping); + memfd_tag_pins(&xas); error = 0; for (scan = 0; scan <= LAST_SCAN; scan++) {