From: Jeff Layton <jlayton@redhat.com>
To: viro@zeniv.linux.org.uk, matthew@wil.cx, bfields@fieldses.org
Cc: linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org,
cluster-devel@redhat.com, sage@inktank.com,
samba-technical@lists.samba.org, Trond.Myklebust@netapp.com,
linux-kernel@vger.kernel.org, piastryyy@gmail.com,
linux-afs@lists.infradead.org, dhowells@redhat.com,
smfrench@gmail.com, linux-fsdevel@vger.kernel.org,
ceph-devel@vger.kernel.org, akpm@linux-foundation.org
Subject: [PATCH v4 13/14] seq_file: add seq_list_*_percpu helpers
Date: Fri, 21 Jun 2013 08:58:21 -0400 [thread overview]
Message-ID: <1371819502-26363-14-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1371819502-26363-1-git-send-email-jlayton@redhat.com>
When we convert the file_lock_list to a set of percpu lists, we'll need
a way to iterate over them in order to output /proc/locks info. Add
some seq_list_*_percpu helpers to handle that.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: J. Bruce Fields <bfields@fieldses.org>
---
fs/seq_file.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++
include/linux/seq_file.h | 6 +++++
2 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 774c1eb..3135c25 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -921,3 +921,57 @@ struct hlist_node *seq_hlist_next_rcu(void *v,
return rcu_dereference(node->next);
}
EXPORT_SYMBOL(seq_hlist_next_rcu);
+
+/**
+ * seq_hlist_start_precpu - start an iteration of a percpu hlist array
+ * @head: pointer to percpu array of struct hlist_heads
+ * @cpu: pointer to cpu "cursor"
+ * @pos: start position of sequence
+ *
+ * Called at seq_file->op->start().
+ */
+struct hlist_node *
+seq_hlist_start_percpu(struct hlist_head __percpu *head, int *cpu, loff_t pos)
+{
+ struct hlist_node *node;
+
+ for_each_possible_cpu(*cpu) {
+ hlist_for_each(node, per_cpu_ptr(head, *cpu)) {
+ if (pos-- == 0)
+ return node;
+ }
+ }
+ return NULL;
+}
+EXPORT_SYMBOL(seq_hlist_start_percpu);
+
+/**
+ * seq_hlist_next_percpu - move to the next position of the percpu hlist array
+ * @v: pointer to current hlist_node
+ * @head: pointer to percpu array of struct hlist_heads
+ * @cpu: pointer to cpu "cursor"
+ * @pos: start position of sequence
+ *
+ * Called at seq_file->op->next().
+ */
+struct hlist_node *
+seq_hlist_next_percpu(void *v, struct hlist_head __percpu *head,
+ int *cpu, loff_t *pos)
+{
+ struct hlist_node *node = v;
+
+ ++*pos;
+
+ if (node->next)
+ return node->next;
+
+ for (*cpu = cpumask_next(*cpu, cpu_possible_mask); *cpu < nr_cpu_ids;
+ *cpu = cpumask_next(*cpu, cpu_possible_mask)) {
+ struct hlist_head *bucket = per_cpu_ptr(head, *cpu);
+
+ if (!hlist_empty(bucket))
+ return bucket->first;
+ }
+ return NULL;
+}
+EXPORT_SYMBOL(seq_hlist_next_percpu);
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 2da29ac..4e32edc 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -173,4 +173,10 @@ extern struct hlist_node *seq_hlist_start_head_rcu(struct hlist_head *head,
extern struct hlist_node *seq_hlist_next_rcu(void *v,
struct hlist_head *head,
loff_t *ppos);
+
+/* Helpers for iterating over per-cpu hlist_head-s in seq_files */
+extern struct hlist_node *seq_hlist_start_percpu(struct hlist_head __percpu *head, int *cpu, loff_t pos);
+
+extern struct hlist_node *seq_hlist_next_percpu(void *v, struct hlist_head __percpu *head, int *cpu, loff_t *pos);
+
#endif
--
1.7.1
next prev parent reply other threads:[~2013-06-21 12:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 12:58 [PATCH v4 00/14] locks: scalability improvements for file locking Jeff Layton
2013-06-21 12:58 ` [PATCH v4 01/14] locks: drop the unused filp argument to posix_unblock_lock Jeff Layton
2013-06-21 12:58 ` [PATCH v4 02/14] cifs: use posix_unblock_lock instead of locks_delete_block Jeff Layton
2013-06-21 12:58 ` [PATCH v4 03/14] locks: make generic_add_lease and generic_delete_lease static Jeff Layton
2013-06-21 12:58 ` [PATCH v4 04/14] locks: comment cleanups and clarifications Jeff Layton
2013-06-21 12:58 ` [PATCH v4 05/14] locks: make "added" in __posix_lock_file a bool Jeff Layton
2013-06-21 12:58 ` [PATCH v4 06/14] locks: encapsulate the fl_link list handling Jeff Layton
[not found] ` <1371819502-26363-7-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-06-25 1:37 ` Stephen Rothwell
[not found] ` <20130625113704.89a686a55dcec684e5e99434-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2013-06-25 10:32 ` Jeff Layton
2013-06-21 12:58 ` [PATCH v4 07/14] locks: protect most of the file_lock handling with i_lock Jeff Layton
2013-06-21 12:58 ` [PATCH v4 08/14] locks: avoid taking global lock if possible when waking up blocked waiters Jeff Layton
2013-06-21 12:58 ` [PATCH v4 09/14] locks: convert fl_link to a hlist_node Jeff Layton
[not found] ` <1371819502-26363-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-06-21 12:58 ` [PATCH v4 10/14] locks: turn the blocked_list into a hashtable Jeff Layton
2013-06-21 12:58 ` [PATCH v4 11/14] locks: add a new "lm_owner_key" lock operation Jeff Layton
2013-06-21 12:58 ` [PATCH v4 12/14] locks: give the blocked_hash its own spinlock Jeff Layton
2013-06-21 12:58 ` Jeff Layton [this message]
2013-06-21 12:58 ` [PATCH v4 14/14] locks: move file_lock_list to a set of percpu hlist_heads and convert file_lock_lock to an lglock Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371819502-26363-14-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=Trond.Myklebust@netapp.com \
--cc=akpm@linux-foundation.org \
--cc=bfields@fieldses.org \
--cc=ceph-devel@vger.kernel.org \
--cc=cluster-devel@redhat.com \
--cc=dhowells@redhat.com \
--cc=linux-afs@lists.infradead.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=piastryyy@gmail.com \
--cc=sage@inktank.com \
--cc=samba-technical@lists.samba.org \
--cc=smfrench@gmail.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).