#define CREATE_TRACE_POINTS
#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
#define TRACE_INCLUDE_FILE lttng-statedump
+#define LTTNG_INSTRUMENTATION
#include "instrumentation/events/lttng-module/lttng-statedump.h"
DEFINE_TRACE(lttng_statedump_block_device);
}
#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)
{
* the lock is taken, but we are not aware whether this is
* guaranteed or not, so play safe.
*/
- if (fd < fdt->max_fds && test_bit(fd, fdt->close_on_exec))
+ if (fd < fdt->max_fds && lttng_close_on_exec(fd, fdt))
flags |= O_CLOEXEC;
if (IS_ERR(s)) {
struct dentry *dentry = file->f_path.dentry;
}
#endif
+/*
+ * Called with task lock held.
+ */
static
void lttng_statedump_process_ns(struct lttng_session *session,
struct task_struct *p,
struct nsproxy *proxy;
struct pid_namespace *pid_ns;
+ /*
+ * Back and forth on locking strategy within Linux upstream for nsproxy.
+ * See Linux upstream commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3
+ * "namespaces: Use task_lock and not rcu to protect nsproxy"
+ * for details.
+ */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
rcu_read_lock();
proxy = task_nsproxy(p);
+#else /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
+ proxy = p->nsproxy;
+#endif /* #else #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
if (proxy) {
pid_ns = lttng_get_proxy_pid_ns(proxy);
do {
trace_lttng_statedump_process_state(session,
p, type, mode, submode, status, NULL);
}
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
rcu_read_unlock();
+#endif /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
}
static