From: Richard Weinberger <richard@nod.at>
To: netfilter-devel@vger.kernel.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
eric.dumazet@gmail.com, jengelh@medozas.de,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 2/6] ring_buffer: Export for_each_buffer_cpu()
Date: Sun, 22 Jan 2012 22:56:17 +0100 [thread overview]
Message-ID: <1327269381-20748-3-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1327269381-20748-1-git-send-email-richard@nod.at>
In order to make ring_buffer usable to other modules
for_each_buffer_cpu() needs to be exported.
Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
---
include/linux/ring_buffer.h | 5 +++++
kernel/trace/ring_buffer.c | 7 +++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
index 67be037..5c1c29f 100644
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@ -185,4 +185,9 @@ enum ring_buffer_flags {
RB_FL_OVERWRITE = 1 << 0,
};
+cpumask_var_t *ring_buffer_mask(struct ring_buffer *buffer);
+
+#define for_each_buffer_cpu(buffer, cpu) \
+ for_each_cpu(cpu, *(ring_buffer_mask(buffer)))
+
#endif /* _LINUX_RING_BUFFER_H */
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index f5b7b5c..a4117c5 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -348,6 +348,7 @@ void *ring_buffer_event_data(struct ring_buffer_event *event)
}
EXPORT_SYMBOL_GPL(ring_buffer_event_data);
+#undef for_each_buffer_cpu
#define for_each_buffer_cpu(buffer, cpu) \
for_each_cpu(cpu, buffer->cpumask)
@@ -4139,3 +4140,9 @@ static int rb_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
#endif
+
+cpumask_var_t *ring_buffer_mask(struct ring_buffer *buffer)
+{
+ return &buffer->cpumask;
+}
+EXPORT_SYMBOL_GPL(ring_buffer_mask);
--
1.7.7
next prev parent reply other threads:[~2012-01-22 22:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-22 21:56 [PATCH v2] Merge ipt_LOG and ip6t_LOG, add ring bufffer support Richard Weinberger
2012-01-22 21:56 ` [PATCH 1/6] Netfilter: Merge ipt_LOG and ip6_LOG into xt_LOG Richard Weinberger
2012-01-30 9:01 ` richard -rw- weinberger
2012-02-01 1:24 ` Jan Engelhardt
2012-02-01 2:53 ` Pablo Neira Ayuso
2012-02-01 9:14 ` richard -rw- weinberger
2012-02-01 14:47 ` Jan Engelhardt
2012-02-01 15:08 ` richard -rw- weinberger
2012-02-01 15:19 ` Jan Engelhardt
2012-01-22 21:56 ` Richard Weinberger [this message]
2012-01-22 21:56 ` [PATCH 3/6] xt_log: Make printk() in sb_close() optional Richard Weinberger
2012-01-22 21:56 ` [PATCH 4/6] Netfilter: xt_LOG: Implement ring buffer support Richard Weinberger
2012-01-22 21:56 ` [PATCH 5/6] iptables: Merge libip6t_LOG and libipt_LOG into libxt_LOG Richard Weinberger
2012-01-22 21:56 ` [PATCH 6/6] iptables: xt_LOG: Add ring buffer support Richard Weinberger
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=1327269381-20748-3-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=eric.dumazet@gmail.com \
--cc=jengelh@medozas.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/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).