summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksym Planeta <mcsim.planeta@gmail.com>2012-10-08 15:16:13 +0300
committerMaksym Planeta <mcsim.planeta@gmail.com>2012-10-08 15:16:13 +0300
commit6a08b518a60bd0e9448278f88f6f55681a5b9c6c (patch)
tree459b4077663475b39aadce1e9ab407379e21c400
parentc3d905cfb9486eb1d2887fe8167f038c57fa0bb6 (diff)
Add memory advice attribute to memory object and entry.
* include/mach/vm_advice.h: New file with some definitions used for making memory advice. (vm_advice_t): Enumeration that is used to denote memory advice. (VM_ADVICE_MAX_READAHEAD): New macro, that denotes maximal size of cluster to be read. (struct vm_advice_entry): Structure that keeps number of pages to be read before and after the page where fault occurred for some specific memory advice. * Makefrag.am (include_mach_HEADERS): Add file vm_advice.h. * include/mach/mach_types.h: Include header mach/vm_advice.h. * vm/vm_map.h: Include mach/vm_advice.h. (struct vm_map_entry): Add advice to map entry attributes. * vm/vm_map.c (vm_map_find_entry): Add advice to new entry template. (vm_map_enter): Likewise. * vm/vm_object.h: Include mach/vm_advice.h. (struct vm_object): Add advice to memory object attributes. * vm/vm_object.c (vm_object_bootstrap): Add advice to object template.
-rw-r--r--Makefrag.am1
-rw-r--r--include/mach/mach_types.h1
-rw-r--r--include/mach/vm_advice.h52
-rw-r--r--vm/vm_map.c2
-rw-r--r--vm/vm_map.h2
-rw-r--r--vm/vm_object.c1
-rw-r--r--vm/vm_object.h2
7 files changed, 61 insertions, 0 deletions
diff --git a/Makefrag.am b/Makefrag.am
index 71800937..ac2737f9 100644
--- a/Makefrag.am
+++ b/Makefrag.am
@@ -389,6 +389,7 @@ include_mach_HEADERS = \
include/mach/version.h \
include/mach/vm_attributes.h \
include/mach/vm_inherit.h \
+ include/mach/vm_advice.h \
include/mach/vm_param.h \
include/mach/vm_prot.h \
include/mach/vm_statistics.h \
diff --git a/include/mach/mach_types.h b/include/mach/mach_types.h
index f6ceac3b..7b5548b2 100644
--- a/include/mach/mach_types.h
+++ b/include/mach/mach_types.h
@@ -50,6 +50,7 @@
#include <mach/time_value.h>
#include <mach/vm_attributes.h>
#include <mach/vm_inherit.h>
+#include <mach/vm_advice.h>
#include <mach/vm_prot.h>
#include <mach/vm_statistics.h>
diff --git a/include/mach/vm_advice.h b/include/mach/vm_advice.h
new file mode 100644
index 00000000..47b43a62
--- /dev/null
+++ b/include/mach/vm_advice.h
@@ -0,0 +1,52 @@
+/*
+ * Mach Operating System
+ * Copyright (c) 2012 Free Software Foundation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * File: mach/vm_advice.h
+ * Author: Maksym Planeta
+ *
+ * Virtual memory map advice definitions.
+ *
+ */
+
+#ifndef _MACH_VM_ADVICE_H_
+#define _MACH_VM_ADVICE_H_
+
+/*
+ * Types defined:
+ *
+ * vm_advice_t Enumeration of valid advice codes.
+ *
+ */
+
+typedef enum {
+ VM_ADVICE_DEFAULT,
+ VM_ADVICE_RANDOM,
+ VM_ADVICE_SEQUENTIAL,
+ VM_ADVICE_NORMAL,
+ VM_ADVICE_KEEP
+} vm_advice_t;
+
+#define VM_ADVICE_MAX_READAHEAD 2
+
+struct vm_advice_entry {
+ vm_offset_t read_before;
+ vm_offset_t read_after;
+};
+
+#endif /* _MACH_VM_ADVICE_H_ */
diff --git a/vm/vm_map.c b/vm/vm_map.c
index c46afc07..22fe0eae 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -652,6 +652,7 @@ kern_return_t vm_map_find_entry(map, address, size, mask, object, o_entry)
new_entry->needs_copy = FALSE;
new_entry->inheritance = VM_INHERIT_DEFAULT;
+ new_entry->advice = VM_ADVICE_DEFAULT;
new_entry->protection = VM_PROT_DEFAULT;
new_entry->max_protection = VM_PROT_ALL;
new_entry->wired_count = 1;
@@ -986,6 +987,7 @@ kern_return_t vm_map_enter(
new_entry->needs_copy = needs_copy;
new_entry->inheritance = inheritance;
+ new_entry->advice = VM_ADVICE_DEFAULT;
new_entry->protection = cur_protection;
new_entry->max_protection = max_protection;
new_entry->wired_count = 0;
diff --git a/vm/vm_map.h b/vm/vm_map.h
index d5bcf96b..af7588ba 100644
--- a/vm/vm_map.h
+++ b/vm/vm_map.h
@@ -46,6 +46,7 @@
#include <mach/vm_attributes.h>
#include <mach/vm_prot.h>
#include <mach/vm_inherit.h>
+#include <mach/vm_advice.h>
#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
@@ -118,6 +119,7 @@ struct vm_map_entry {
vm_prot_t protection; /* protection code */
vm_prot_t max_protection; /* maximum protection */
vm_inherit_t inheritance; /* inheritance */
+ vm_advice_t advice; /* advice */
unsigned short wired_count; /* can be paged if = 0 */
unsigned short user_wired_count; /* for vm_wire */
struct vm_map_entry *projected_on; /* 0 for normal map entry
diff --git a/vm/vm_object.c b/vm/vm_object.c
index f1017086..e21ce140 100644
--- a/vm/vm_object.c
+++ b/vm/vm_object.c
@@ -283,6 +283,7 @@ void vm_object_bootstrap(void)
* permanent object becomes ready */
vm_object_template.use_shared_copy = FALSE;
vm_object_template.shadowed = FALSE;
+ vm_object_template.advice = VM_ADVICE_DEFAULT;
vm_object_template.absent_count = 0;
vm_object_template.all_wanted = 0; /* all bits FALSE */
diff --git a/vm/vm_object.h b/vm/vm_object.h
index c9925709..8ab97699 100644
--- a/vm/vm_object.h
+++ b/vm/vm_object.h
@@ -40,6 +40,7 @@
#include <mach/memory_object.h>
#include <mach/port.h>
#include <mach/vm_prot.h>
+#include <mach/vm_advice.h>
#include <mach/machine/vm_types.h>
#include <kern/queue.h>
#include <kern/lock.h>
@@ -88,6 +89,7 @@ struct vm_object {
memory_object_copy_strategy_t
copy_strategy; /* How to handle data copy */
+ vm_advice_t advice; /* How to handle page faults */
unsigned int
absent_count; /* The number of pages that