Add vm_object_sync support

* include/mach/vm_sync.h: New file.
* include/mach/mach_types.h: Include <mach/vm_sync.h>
* Makefrag.am (include_mach_HEADERS): Add include/mach/vm_sync.h.
* include/mach/mach_types.defs (vm_sync_t): Add type.
* include/mach/gnumach.defs (vm_object_sync, vm_msync): Add RPCs.
* vm/vm_map.h: Include <mach/vm_sync.h>.
(vm_map_msync): New declaration.
* vm/vm_map.c (vm_map_msync): New function.
* vm/vm_user.c: Include <mach/vm_sync.h> and <kern/mach.server.h>.
(vm_object_sync, vm_msync): New functions.

8 files changed, 149 insertions, 0 deletions

diff --git a/Makefrag.am b/Makefrag.am
index 4625b487..754d87e2 100644
--- a/Makefrag.am
+++ b/Makefrag.am
@@ -421,6 +421,7 @@ include_mach_HEADERS = \
 	include/mach/vm_param.h \
 	include/mach/vm_prot.h \
 	include/mach/vm_statistics.h \
+	include/mach/vm_sync.h \
 	include/mach/vm_wire.h \
 	include/mach/inline.h \
 	include/mach/xen.h
diff --git a/include/mach/gnumach.defs b/include/mach/gnumach.defs
index b484accc..97ab573c 100644
--- a/include/mach/gnumach.defs
+++ b/include/mach/gnumach.defs
@@ -151,3 +151,17 @@ routine	vm_wire_all(
 		host		: mach_port_t;
 		task		: vm_task_t;
 		flags		: vm_wire_t);
+
+routine vm_object_sync(
+		object		: memory_object_name_t;
+		offset		: vm_offset_t;
+		size		: vm_size_t;
+		should_flush	: boolean_t;
+		should_return	: boolean_t;
+		should_iosync	: boolean_t);
+
+routine vm_msync(
+		target_task	: vm_task_t;
+		address		: vm_address_t;
+		size		: vm_size_t;
+		sync_flags	: vm_sync_t);
diff --git a/include/mach/mach_types.defs b/include/mach/mach_types.defs
index 8e68d385..a0e9241c 100644
--- a/include/mach/mach_types.defs
+++ b/include/mach/mach_types.defs
@@ -118,6 +118,7 @@ type vm_inherit_t = int;
 type vm_statistics_data_t = struct[13] of integer_t;
 type vm_machine_attribute_t = int;
 type vm_machine_attribute_val_t = int;
+type vm_sync_t = int;
 
 type thread_info_t		= array[*:1024] of integer_t;
 type thread_basic_info_data_t	= struct[11] of integer_t;
diff --git a/include/mach/mach_types.h b/include/mach/mach_types.h
index 65164a99..57f8f22d 100644
--- a/include/mach/mach_types.h
+++ b/include/mach/mach_types.h
@@ -54,6 +54,7 @@
 #include <mach/vm_statistics.h>
 #include <mach/vm_cache_statistics.h>
 #include <mach/vm_wire.h>
+#include <mach/vm_sync.h>
 
 #ifdef	MACH_KERNEL
 #include <kern/task.h>		/* for task_array_t */
diff --git a/include/mach/vm_sync.h b/include/mach/vm_sync.h
new file mode 100644
index 00000000..0c7451c4
--- /dev/null
+++ b/include/mach/vm_sync.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018 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, see <http://www.gnu.org/licenses/>.
+ * All Rights Reserved.
+ */
+
+#ifndef	_MACH_VM_SYNC_H_
+#define	_MACH_VM_SYNC_H_
+
+/*
+ *	Types defined:
+ *
+ *	vm_sync_t		VM synchronization flags
+ */
+
+typedef int		vm_sync_t;
+
+/*
+ *	Synchronization values
+ */
+
+#define	VM_SYNC_ASYNCHRONOUS	((vm_sync_t) 0x01)
+#define	VM_SYNC_SYNCHRONOUS	((vm_sync_t) 0x02)
+#define	VM_SYNC_INVALIDATE	((vm_sync_t) 0x04)
+#if 0
+/* Not supported yet.  */
+#define	VM_SYNC_KILLPAGES	((vm_sync_t) 0x08)
+#define	VM_SYNC_DEACTIVATE	((vm_sync_t) 0x10)
+#define	VM_SYNC_CONTIGUOUS	((vm_sync_t) 0x20)
+#define	VM_SYNC_REUSABLEPAGES	((vm_sync_t) 0x40)
+#endif
+
+#endif	/* _MACH_VM_SYNC_H_ */
diff --git a/vm/vm_map.c b/vm/vm_map.c
index 2fd27316..8afa74b3 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -4868,6 +4868,37 @@ kern_return_t vm_map_machine_attribute(
 	return ret;
 }
 
+/*
+ *	Routine:	vm_map_msync
+ *	Purpose:
+ *		Synchronize out pages of the given map out to their memory
+ *		manager, if any.
+ */
+kern_return_t vm_map_msync(
+	vm_map_t	map,
+	vm_offset_t	address,
+	vm_size_t	size,
+	vm_sync_t	sync_flags)
+{
+	if (map == VM_MAP_NULL)
+		KERN_INVALID_ARGUMENT;
+
+	if (sync_flags & (VM_SYNC_ASYNCHRONOUS | VM_SYNC_SYNCHRONOUS) ==
+			 (VM_SYNC_ASYNCHRONOUS | VM_SYNC_SYNCHRONOUS))
+		KERN_INVALID_ARGUMENT;
+
+	size =	round_page(address + size) - trunc_page(address);
+	address = trunc_page(address);
+
+	if (size == 0)
+		return KERN_SUCCESS;
+
+	/* TODO */
+
+	return KERN_INVALID_ARGUMENT;
+}
+
+
 
 #if	MACH_KDB
 
diff --git a/vm/vm_map.h b/vm/vm_map.h
index 87660f31..2561ec44 100644
--- a/vm/vm_map.h
+++ b/vm/vm_map.h
@@ -47,6 +47,7 @@
 #include <mach/vm_prot.h>
 #include <mach/vm_inherit.h>
 #include <mach/vm_wire.h>
+#include <mach/vm_sync.h>
 #include <vm/pmap.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
@@ -443,6 +444,9 @@ extern kern_return_t	vm_map_machine_attribute(vm_map_t, vm_offset_t,
 						 vm_machine_attribute_t,
 						 vm_machine_attribute_val_t *);
 
+extern kern_return_t	vm_map_msync(vm_map_t,
+				     vm_offset_t, vm_size_t, vm_sync_t);
+
 /* Delete entry from map */
 extern void		vm_map_entry_delete(vm_map_t, vm_map_entry_t);
 
diff --git a/vm/vm_user.c b/vm/vm_user.c
index 6c1e3d6f..b6a069a5 100644
--- a/vm/vm_user.c
+++ b/vm/vm_user.c
@@ -39,8 +39,10 @@
 #include <mach/vm_param.h>
 #include <mach/vm_statistics.h>
 #include <mach/vm_cache_statistics.h>
+#include <mach/vm_sync.h>
 #include <kern/host.h>
 #include <kern/task.h>
+#include <kern/mach.server.h>
 #include <vm/vm_fault.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_map.h>
@@ -479,3 +481,53 @@ kern_return_t vm_wire_all(const ipc_port_t port, vm_map_t map, vm_wire_t flags)
 
 	return vm_map_pageable_all(map, flags);
 }
+
+/*
+ *	vm_object_sync synchronizes out pages from the memory object to its
+ *	memory manager, if any.
+ */
+kern_return_t vm_object_sync(
+	vm_object_t		object,
+	vm_offset_t		offset,
+	vm_size_t		size,
+	boolean_t		should_flush,
+	boolean_t		should_return,
+	boolean_t		should_iosync)
+{
+	if (object == VM_OBJECT_NULL)
+		return KERN_INVALID_ARGUMENT;
+
+	/* FIXME: we should rather introduce an internal function, e.g.
+	   vm_object_update, rather than calling memory_object_lock_request.  */
+	vm_object_reference(object);
+
+	/* This is already always synchronous for now.  */
+	(void) should_iosync;
+
+	size = round_page(offset + size) - trunc_page(offset);
+	offset = trunc_page(offset);
+
+	return  memory_object_lock_request(object, offset, size,
+					   should_return ?
+						MEMORY_OBJECT_RETURN_ALL :
+						MEMORY_OBJECT_RETURN_NONE,
+					   should_flush,
+					   VM_PROT_NO_CHANGE,
+					   NULL, 0);
+}
+
+/*
+ *	vm_msync synchronizes out pages from the map to their memory manager,
+ *	if any.
+ */
+kern_return_t vm_msync(
+	vm_map_t		map,
+	vm_address_t		address,
+	vm_size_t		size,
+	vm_sync_t		sync_flags)
+{
+	if (map == VM_MAP_NULL)
+		return KERN_INVALID_ARGUMENT;
+
+	return vm_map_msync(map, (vm_offset_t) address, size, sync_flags);
+}