lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Fri,  9 Jul 2010 16:53:50 +0100
From:	Eric B Munson <emunson@...bm.net>
To:	akpm@...ux-foundation.org
Cc:	mingo@...hat.com, hugh.dickins@...cali.co.uk, riel@...hat.com,
	peterz@...radead.org, anton@...ba.org, hch@...radead.org,
	linux-kernel@...r.kernel.org, linux-mm@...ck.org,
	Eric B Munson <emunson@...bm.net>
Subject: [PATCH 2/2] Add trace point to mremap

This patch completes the trace point addition to the [m|mre|mun]map
and brk functions.  These trace points will be used by a userspace
tool that models application memory usage.

Signed-off-by: Eric B Munson <emunson@...bm.net>
---
 include/trace/events/mremap.h |   37 +++++++++++++++++++++++++++++++++++++
 mm/mremap.c                   |    5 +++++
 2 files changed, 42 insertions(+), 0 deletions(-)
 create mode 100644 include/trace/events/mremap.h

diff --git a/include/trace/events/mremap.h b/include/trace/events/mremap.h
new file mode 100644
index 0000000..754a43b
--- /dev/null
+++ b/include/trace/events/mremap.h
@@ -0,0 +1,37 @@
+#if !defined(_TRACE_MREMAP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_MREMAP_H_
+
+#include <linux/tracepoint.h>
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM mremap
+
+TRACE_EVENT(mremap,
+	TP_PROTO(unsigned long addr, unsigned long old_len,
+		 unsigned long new_addr, unsigned long new_len),
+
+	TP_ARGS(addr, old_len, new_addr, new_len),
+
+	TP_STRUCT__entry(
+		__field(unsigned long, addr)
+		__field(unsigned long, old_len)
+		__field(unsigned long, new_addr)
+		__field(unsigned long, new_len)
+	),
+
+	TP_fast_assign(
+		__entry->addr = addr;
+		__entry->old_len = old_len;
+		__entry->new_addr = new_addr;
+		__entry->new_len = new_len;
+	),
+
+	TP_printk("remapping %lu bytes from %lu to %lu bytes at %lu\n",
+		  __entry->old_len, __entry->addr, __entry->new_len,
+		  __entry->new_addr)
+);
+
+#endif /* _TRACE_MREMAP_H_ */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/mm/mremap.c b/mm/mremap.c
index cde56ee..b3aaff0 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -20,6 +20,9 @@
 #include <linux/syscalls.h>
 #include <linux/mmu_notifier.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/mremap.h>
+
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
@@ -504,6 +507,8 @@ unsigned long do_mremap(unsigned long addr,
 out:
 	if (ret & ~PAGE_MASK)
 		vm_unacct_memory(charged);
+	else
+		trace_mremap(addr, old_len, new_addr, new_len);
 	return ret;
 }
 
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ