From d693a5a5157f950da70ac4f0ff4e8ba45eb56791 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Wed, 17 Apr 2024 23:34:57 -0400 Subject: kernel: vm: Add vnode pager Signed-off-by: Ian Moffett --- sys/include/sys/vnode.h | 2 ++ sys/include/vm/obj.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ sys/include/vm/page.h | 4 ++++ sys/include/vm/pager.h | 47 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 sys/include/vm/obj.h create mode 100644 sys/include/vm/pager.h (limited to 'sys/include') diff --git a/sys/include/sys/vnode.h b/sys/include/sys/vnode.h index ea537f6..6dc2cbc 100644 --- a/sys/include/sys/vnode.h +++ b/sys/include/sys/vnode.h @@ -33,6 +33,7 @@ #include #include #include +#include #include struct vnode; @@ -53,6 +54,7 @@ struct vattr { struct vnode { int type; int flags; + struct vm_object *vmobj; struct mount *mp; /* Ptr to vfs vnode is in */ struct vops *vops; struct vnode *parent; diff --git a/sys/include/vm/obj.h b/sys/include/vm/obj.h new file mode 100644 index 0000000..d44454e --- /dev/null +++ b/sys/include/vm/obj.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _VM_OBJ_H_ +#define _VM_OBJ_H_ + +#include +#include +#include +#include +#include + +struct vm_object { + struct spinlock lock; /* Protects this object */ + struct vm_mapspace mapspace; /* Mapspace this object points to */ + struct vm_pagerops *pgops; /* Pager operations */ + + uint8_t is_anon : 1; + struct vnode *vnode; +}; + +int vm_obj_init(struct vm_object **res, struct vnode *vnode); +int vm_obj_destroy(struct vm_object *obj); + +#endif /* !_VM_OBJ_H_ */ diff --git a/sys/include/vm/page.h b/sys/include/vm/page.h index d1e89ea..80fa74f 100644 --- a/sys/include/vm/page.h +++ b/sys/include/vm/page.h @@ -32,6 +32,10 @@ #include +struct vm_page { + paddr_t physaddr; +}; + void vm_zero_page(void *page, size_t page_count); #endif /* !_VM_PAGE_H_ */ diff --git a/sys/include/vm/pager.h b/sys/include/vm/pager.h new file mode 100644 index 0000000..5f36bfc --- /dev/null +++ b/sys/include/vm/pager.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _VM_PAGER_H_ +#define _VM_PAGER_H_ + +#include +#include + +struct vm_object; + +struct vm_pagerops { + int(*get)(struct vm_object *obj, off_t off, size_t len, struct vm_page *pg); + int(*store)(struct vm_object *obj, off_t off, size_t len, struct vm_page *pg); +}; + +extern struct vm_pagerops g_vnode_pagerops; + +int vm_pager_get(struct vm_object *obj, off_t off, size_t len, struct vm_page *pg); + +#endif /* !_VM_PAGER_H_ */ -- cgit v1.2.3