From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-288557-1516220879-2-7316969309345015283 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 roen, 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=1516220878; b=FSCvRwGl7daSBGrbZAFIGozxQTqD7fNksPg1czOHHKQSlMS 2wLyr+osixp7emzIYRzV0BEk5oO50LdQzPV+kTO6ptEhIfi2Cwb4z3Z/LYAvDDyv 7y99BEnINUzARK9w/iAcAesmn41CI6dPfKzx40EW6uPkc54FIUnCYF7pf014sWB6 fTuVFjd+7J9Gbqbbx2HcPflgGalkMAwzq/4+6Ni+Dd31juOtWZNsbkmBx/Nie/PO Fkewx4kmPJADcXGV5ictGMu2JLwPkpOtravnZmjRENlYU9u1GqG9BgjKsQPQueVA 64tC1BFm+FlKae48v3na1Vet9R7qud2rbVqaeCg== 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=1516220878; bh=jpDeZ/51Is0e/HUkh4WAEQnps4l5130Ce6futvK8E9o=; b=HjeynOfmXSQu MBggOV+rM14USbasYGF3C5cVyT2smvtE+CGWB+E2wiS9QLiu4hTan8fu52MtljcH 1Wca+igBFH7vW7atj9SYcdq4Y4/vZjlxhlgOEg9DR4b5v1feAZhfVgC13SuIBDqT nIYW4huyP234PcS9wLFqfE7/ljpo2u0dcUsrKhzSSwfg843yrILp40AHieRAaFNT yVZmLJSscNcoYgTGdqP3zcMXS251RJUrdlKRbfHg8nSTum/SbGA+YYJaiA2o8p/T GnsaLf37H8Y3wiQ1/7g92HczeBGQmmRRgQLPL9HVgfSWzDsWDLyprMh5X0U6Xrqg MMuUJrGntg== ARC-Authentication-Results: i=1; mx3.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=MN4v26tz 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: mx3.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=MN4v26tz 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 S1754533AbeAQU1x (ORCPT ); Wed, 17 Jan 2018 15:27:53 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:57673 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754009AbeAQUXF (ORCPT ); Wed, 17 Jan 2018 15:23:05 -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 92/99] f2fs: Convert pids radix tree to XArray Date: Wed, 17 Jan 2018 12:21:56 -0800 Message-Id: <20180117202203.19756-93-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 The XArray API works out rather well for this user. Signed-off-by: Matthew Wilcox --- fs/f2fs/super.c | 2 -- fs/f2fs/trace.c | 60 ++++----------------------------------------------------- fs/f2fs/trace.h | 2 -- 3 files changed, 4 insertions(+), 60 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 708155d9c2e4..d608edffe69e 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2831,8 +2831,6 @@ static int __init init_f2fs_fs(void) { int err; - f2fs_build_trace_ios(); - err = init_inodecache(); if (err) goto fail; diff --git a/fs/f2fs/trace.c b/fs/f2fs/trace.c index bccbbf2616d2..f316a42c547f 100644 --- a/fs/f2fs/trace.c +++ b/fs/f2fs/trace.c @@ -16,8 +16,7 @@ #include "f2fs.h" #include "trace.h" -static RADIX_TREE(pids, GFP_ATOMIC); -static spinlock_t pids_lock; +static DEFINE_XARRAY(pids); static struct last_io_info last_io; static inline void __print_last_io(void) @@ -57,28 +56,13 @@ void f2fs_trace_pid(struct page *page) { struct inode *inode = page->mapping->host; pid_t pid = task_pid_nr(current); - void *p; set_page_private(page, (unsigned long)pid); - if (radix_tree_preload(GFP_NOFS)) - return; - - spin_lock(&pids_lock); - p = radix_tree_lookup(&pids, pid); - if (p == current) - goto out; - if (p) - radix_tree_delete(&pids, pid); - - f2fs_radix_tree_insert(&pids, pid, current); - - trace_printk("%3x:%3x %4x %-16s\n", + if (xa_store(&pids, pid, current, GFP_NOFS) != current) + trace_printk("%3x:%3x %4x %-16s\n", MAJOR(inode->i_sb->s_dev), MINOR(inode->i_sb->s_dev), pid, current->comm); -out: - spin_unlock(&pids_lock); - radix_tree_preload_end(); } void f2fs_trace_ios(struct f2fs_io_info *fio, int flush) @@ -120,43 +104,7 @@ void f2fs_trace_ios(struct f2fs_io_info *fio, int flush) return; } -void f2fs_build_trace_ios(void) -{ - spin_lock_init(&pids_lock); -} - -#define PIDVEC_SIZE 128 -static unsigned int gang_lookup_pids(pid_t *results, unsigned long first_index, - unsigned int max_items) -{ - struct radix_tree_iter iter; - void **slot; - unsigned int ret = 0; - - if (unlikely(!max_items)) - return 0; - - radix_tree_for_each_slot(slot, &pids, &iter, first_index) { - results[ret] = iter.index; - if (++ret == max_items) - break; - } - return ret; -} - void f2fs_destroy_trace_ios(void) { - pid_t pid[PIDVEC_SIZE]; - pid_t next_pid = 0; - unsigned int found; - - spin_lock(&pids_lock); - while ((found = gang_lookup_pids(pid, next_pid, PIDVEC_SIZE))) { - unsigned idx; - - next_pid = pid[found - 1] + 1; - for (idx = 0; idx < found; idx++) - radix_tree_delete(&pids, pid[idx]); - } - spin_unlock(&pids_lock); + xa_destroy(&pids); } diff --git a/fs/f2fs/trace.h b/fs/f2fs/trace.h index 67db24ac1e85..157e4564e48b 100644 --- a/fs/f2fs/trace.h +++ b/fs/f2fs/trace.h @@ -34,12 +34,10 @@ struct last_io_info { extern void f2fs_trace_pid(struct page *); extern void f2fs_trace_ios(struct f2fs_io_info *, int); -extern void f2fs_build_trace_ios(void); extern void f2fs_destroy_trace_ios(void); #else #define f2fs_trace_pid(p) #define f2fs_trace_ios(i, n) -#define f2fs_build_trace_ios() #define f2fs_destroy_trace_ios() #endif -- 2.15.1