projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: rcu: Fix data-race due to atomic_t copy-by-value (v5.6)
[lttng-modules.git]
/
lttng-statedump-impl.c
diff --git
a/lttng-statedump-impl.c
b/lttng-statedump-impl.c
index d4f29fd397bc69e53c18803a434ed8adaac95880..066b9612c0ee5f3884f023c1211eef17c58ad305 100644
(file)
--- a/
lttng-statedump-impl.c
+++ b/
lttng-statedump-impl.c
@@
-1,4
+1,5
@@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
* lttng-statedump.c
*
* Linux Trace Toolkit Next Generation Kernel State Dump
* lttng-statedump.c
*
* Linux Trace Toolkit Next Generation Kernel State Dump
@@
-6,20
+7,6
@@
* Copyright 2005 Jean-Hugues Deschenes <jean-hugues.deschenes@polymtl.ca>
* Copyright 2006-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* Copyright 2005 Jean-Hugues Deschenes <jean-hugues.deschenes@polymtl.ca>
* Copyright 2006-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
* Changes:
* Eric Clement: Add listing of network IP interface
* 2006, 2007 Mathieu Desnoyers Fix kernel threads
* Changes:
* Eric Clement: Add listing of network IP interface
* 2006, 2007 Mathieu Desnoyers Fix kernel threads
@@
-47,15
+34,16
@@
#include <linux/mutex.h>
#include <linux/device.h>
#include <linux/mutex.h>
#include <linux/device.h>
-#include "lttng-events.h"
-#include "lttng-tracer.h"
-#include "wrapper/irqdesc.h"
-#include "wrapper/spinlock.h"
-#include "wrapper/fdtable.h"
-#include "wrapper/nsproxy.h"
-#include "wrapper/irq.h"
-#include "wrapper/tracepoint.h"
-#include "wrapper/genhd.h"
+#include <lttng-events.h>
+#include <lttng-tracer.h>
+#include <wrapper/irqdesc.h>
+#include <wrapper/fdtable.h>
+#include <wrapper/namespace.h>
+#include <wrapper/irq.h>
+#include <wrapper/tracepoint.h>
+#include <wrapper/genhd.h>
+#include <wrapper/file.h>
+#include <wrapper/time.h>
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#include <linux/irq.h>
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#include <linux/irq.h>
@@
-63,10
+51,10
@@
/* Define the tracepoints, but do not build the probes */
#define CREATE_TRACE_POINTS
/* Define the tracepoints, but do not build the probes */
#define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH
../
instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
#define TRACE_INCLUDE_FILE lttng-statedump
#define LTTNG_INSTRUMENTATION
#define TRACE_INCLUDE_FILE lttng-statedump
#define LTTNG_INSTRUMENTATION
-#include
"instrumentation/events/lttng-module/lttng-statedump.h"
+#include
<instrumentation/events/lttng-module/lttng-statedump.h>
DEFINE_TRACE(lttng_statedump_block_device);
DEFINE_TRACE(lttng_statedump_end);
DEFINE_TRACE(lttng_statedump_block_device);
DEFINE_TRACE(lttng_statedump_end);
@@
-74,7
+62,21
@@
DEFINE_TRACE(lttng_statedump_interrupt);
DEFINE_TRACE(lttng_statedump_file_descriptor);
DEFINE_TRACE(lttng_statedump_start);
DEFINE_TRACE(lttng_statedump_process_state);
DEFINE_TRACE(lttng_statedump_file_descriptor);
DEFINE_TRACE(lttng_statedump_start);
DEFINE_TRACE(lttng_statedump_process_state);
+DEFINE_TRACE(lttng_statedump_process_pid_ns);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
+DEFINE_TRACE(lttng_statedump_process_cgroup_ns);
+#endif
+DEFINE_TRACE(lttng_statedump_process_ipc_ns);
+#ifndef LTTNG_MNT_NS_MISSING_HEADER
+DEFINE_TRACE(lttng_statedump_process_mnt_ns);
+#endif
+DEFINE_TRACE(lttng_statedump_process_net_ns);
+DEFINE_TRACE(lttng_statedump_process_user_ns);
+DEFINE_TRACE(lttng_statedump_process_uts_ns);
DEFINE_TRACE(lttng_statedump_network_interface);
DEFINE_TRACE(lttng_statedump_network_interface);
+#ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
+DEFINE_TRACE(lttng_statedump_cpu_topology);
+#endif
struct lttng_fd_ctx {
char *page;
struct lttng_fd_ctx {
char *page;
@@
-214,18
+216,6
@@
int lttng_enumerate_network_ip_interface(struct lttng_session *session)
}
#endif /* CONFIG_INET */
}
#endif /* CONFIG_INET */
-#ifdef FD_ISSET /* For old kernels lacking close_on_exec() */
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-{
- return FD_ISSET(fd, fdt->close_on_exec);
-}
-#else
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-{
- return close_on_exec(fd, fdt);
-}
-#endif
-
static
int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
{
static
int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
{
@@
-303,6
+293,28
@@
int lttng_enumerate_file_descriptors(struct lttng_session *session)
return 0;
}
return 0;
}
+#ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
+static
+int lttng_enumerate_cpu_topology(struct lttng_session *session)
+{
+ int cpu;
+ const cpumask_t *cpumask = cpu_possible_mask;
+
+ for (cpu = cpumask_first(cpumask); cpu < nr_cpu_ids;
+ cpu = cpumask_next(cpu, cpumask)) {
+ trace_lttng_statedump_cpu_topology(session, &cpu_data(cpu));
+ }
+
+ return 0;
+}
+#else
+static
+int lttng_enumerate_cpu_topology(struct lttng_session *session)
+{
+ return 0;
+}
+#endif
+
#if 0
/*
* FIXME: we cannot take a mmap_sem while in a RCU read-side critical section
#if 0
/*
* FIXME: we cannot take a mmap_sem while in a RCU read-side critical section
@@
-327,7
+339,7
@@
void lttng_enumerate_task_vm_maps(struct lttng_session *session,
down_read(&mm->mmap_sem);
while (map) {
if (map->vm_file)
down_read(&mm->mmap_sem);
while (map) {
if (map->vm_file)
- ino = map->vm_file->f_dentry->d_inode->i_ino;
+ ino = map->vm_file->
lttng_
f_dentry->d_inode->i_ino;
else
ino = 0;
trace_lttng_statedump_vm_map(session, p, map, ino);
else
ino = 0;
trace_lttng_statedump_vm_map(session, p, map, ino);
@@
-353,10
+365,6
@@
int lttng_enumerate_vm_maps(struct lttng_session *session)
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
-#define irq_desc_get_chip(desc) get_irq_desc_chip(desc)
-#endif
-
static
int lttng_list_interrupts(struct lttng_session *session)
{
static
int lttng_list_interrupts(struct lttng_session *session)
{
@@
-372,12
+380,12
@@
int lttng_list_interrupts(struct lttng_session *session)
irq_desc_get_chip(desc)->name ? : "unnamed_irq_chip";
local_irq_save(flags);
irq_desc_get_chip(desc)->name ? : "unnamed_irq_chip";
local_irq_save(flags);
-
wrapper_desc
_spin_lock(&desc->lock);
+
raw
_spin_lock(&desc->lock);
for (action = desc->action; action; action = action->next) {
trace_lttng_statedump_interrupt(session,
irq, irq_chip_name, action);
}
for (action = desc->action; action; action = action->next) {
trace_lttng_statedump_interrupt(session,
irq, irq_chip_name, action);
}
-
wrapper_desc
_spin_unlock(&desc->lock);
+
raw
_spin_unlock(&desc->lock);
local_irq_restore(flags);
}
return 0;
local_irq_restore(flags);
}
return 0;
@@
-392,6
+400,10
@@
int lttng_list_interrupts(struct lttng_session *session)
#endif
/*
#endif
/*
+ * Statedump the task's namespaces using the proc filesystem inode number as
+ * the unique identifier. The user and pid ns are nested and will be dumped
+ * recursively.
+ *
* Called with task lock held.
*/
static
* Called with task lock held.
*/
static
@@
-404,6
+416,25
@@
void lttng_statedump_process_ns(struct lttng_session *session,
{
struct nsproxy *proxy;
struct pid_namespace *pid_ns;
{
struct nsproxy *proxy;
struct pid_namespace *pid_ns;
+ struct user_namespace *user_ns;
+
+ /*
+ * The pid and user namespaces are special, they are nested and
+ * accessed with specific functions instead of the nsproxy struct
+ * like the other namespaces.
+ */
+ pid_ns = task_active_pid_ns(p);
+ do {
+ trace_lttng_statedump_process_pid_ns(session, p, pid_ns);
+ pid_ns = pid_ns->parent;
+ } while (pid_ns);
+
+
+ user_ns = task_cred_xxx(p, user_ns);
+ do {
+ trace_lttng_statedump_process_user_ns(session, p, user_ns);
+ user_ns = user_ns->lttng_user_ns_parent;
+ } while (user_ns);
/*
* Back and forth on locking strategy within Linux upstream for nsproxy.
/*
* Back and forth on locking strategy within Linux upstream for nsproxy.
@@
-411,28
+442,34
@@
void lttng_statedump_process_ns(struct lttng_session *session,
* "namespaces: Use task_lock and not rcu to protect nsproxy"
* for details.
*/
* "namespaces: Use task_lock and not rcu to protect nsproxy"
* for details.
*/
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
proxy = p->nsproxy;
proxy = p->nsproxy;
-#else
/* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
+#else
rcu_read_lock();
proxy = task_nsproxy(p);
rcu_read_lock();
proxy = task_nsproxy(p);
-#endif
/* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
+#endif
if (proxy) {
if (proxy) {
- pid_ns = lttng_get_proxy_pid_ns(proxy);
- do {
- trace_lttng_statedump_process_state(session,
-
p, type, mode, submode, status, pid
_ns);
- pid_ns = pid_ns->parent;
-
} while (pid
_ns);
- } else {
- trace_lttng_statedump_process_
state(session,
-
p, type, mode, submode, status, NULL
);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
+ trace_lttng_statedump_process_cgroup_ns(session, p, proxy->cgroup_ns);
+#endif
+
trace_lttng_statedump_process_ipc_ns(session, p, proxy->ipc
_ns);
+#ifndef LTTNG_MNT_NS_MISSING_HEADER
+
trace_lttng_statedump_process_mnt_ns(session, p, proxy->mnt
_ns);
+#endif
+ trace_lttng_statedump_process_
net_ns(session, p, proxy->net_ns);
+
trace_lttng_statedump_process_uts_ns(session, p, proxy->uts_ns
);
}
}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
/* (nothing) */
/* (nothing) */
-#else
/* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
+#else
rcu_read_unlock();
rcu_read_unlock();
-#endif
/* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
+#endif
}
static
}
static
@@
-484,6
+521,9
@@
int lttng_enumerate_process_states(struct lttng_session *session)
type = LTTNG_USER_THREAD;
else
type = LTTNG_KERNEL_THREAD;
type = LTTNG_USER_THREAD;
else
type = LTTNG_KERNEL_THREAD;
+
+ trace_lttng_statedump_process_state(session,
+ p, type, mode, submode, status);
lttng_statedump_process_ns(session,
p, type, mode, submode, status);
task_unlock(p);
lttng_statedump_process_ns(session,
p, type, mode, submode, status);
task_unlock(p);
@@
-528,12
+568,17
@@
int do_lttng_statedump(struct lttng_session *session)
return ret;
ret = lttng_enumerate_block_devices(session);
switch (ret) {
return ret;
ret = lttng_enumerate_block_devices(session);
switch (ret) {
+ case 0:
+ break;
case -ENOSYS:
printk(KERN_WARNING "LTTng: block device enumeration is not supported by kernel\n");
break;
default:
return ret;
}
case -ENOSYS:
printk(KERN_WARNING "LTTng: block device enumeration is not supported by kernel\n");
break;
default:
return ret;
}
+ ret = lttng_enumerate_cpu_topology(session);
+ if (ret)
+ return ret;
/* TODO lttng_dump_idt_table(session); */
/* TODO lttng_dump_softirq_vec(session); */
/* TODO lttng_dump_idt_table(session); */
/* TODO lttng_dump_softirq_vec(session); */
@@
-592,7
+637,7
@@
module_exit(lttng_statedump_exit);
MODULE_LICENSE("GPL and additional rights");
MODULE_AUTHOR("Jean-Hugues Deschenes");
MODULE_LICENSE("GPL and additional rights");
MODULE_AUTHOR("Jean-Hugues Deschenes");
-MODULE_DESCRIPTION("L
inux Trace Toolkit Next Generation Statedump
");
+MODULE_DESCRIPTION("L
TTng statedump provider
");
MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
__stringify(LTTNG_MODULES_MINOR_VERSION) "."
__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
__stringify(LTTNG_MODULES_MINOR_VERSION) "."
__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
This page took
0.026385 seconds
and
4
git commands to generate.