mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 19:27:44 +00:00
Kernel: Move ProcessPagingScope to its own files
This commit is contained in:
parent
2839bb0be1
commit
5e0c4d689f
6 changed files with 91 additions and 23 deletions
|
@ -109,6 +109,7 @@ OBJS = \
|
||||||
VM/PhysicalRegion.o \
|
VM/PhysicalRegion.o \
|
||||||
VM/PurgeableVMObject.o \
|
VM/PurgeableVMObject.o \
|
||||||
VM/PrivateInodeVMObject.o \
|
VM/PrivateInodeVMObject.o \
|
||||||
|
VM/ProcessPagingScope.o \
|
||||||
VM/RangeAllocator.o \
|
VM/RangeAllocator.o \
|
||||||
VM/Region.o \
|
VM/Region.o \
|
||||||
VM/SharedInodeVMObject.o \
|
VM/SharedInodeVMObject.o \
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
#include <Kernel/Thread.h>
|
#include <Kernel/Thread.h>
|
||||||
#include <Kernel/VM/MemoryManager.h>
|
#include <Kernel/VM/MemoryManager.h>
|
||||||
#include <Kernel/VM/PageDirectory.h>
|
#include <Kernel/VM/PageDirectory.h>
|
||||||
|
#include <Kernel/VM/ProcessPagingScope.h>
|
||||||
#include <LibC/signal_numbers.h>
|
#include <LibC/signal_numbers.h>
|
||||||
#include <LibELF/ELFLoader.h>
|
#include <LibELF/ELFLoader.h>
|
||||||
|
|
||||||
|
|
|
@ -699,18 +699,4 @@ void MemoryManager::dump_kernel_regions()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ProcessPagingScope::ProcessPagingScope(Process& process)
|
|
||||||
{
|
|
||||||
ASSERT(Thread::current);
|
|
||||||
m_previous_cr3 = read_cr3();
|
|
||||||
MM.enter_process_paging_scope(process);
|
|
||||||
}
|
|
||||||
|
|
||||||
ProcessPagingScope::~ProcessPagingScope()
|
|
||||||
{
|
|
||||||
InterruptDisabler disabler;
|
|
||||||
Thread::current->tss().cr3 = m_previous_cr3;
|
|
||||||
write_cr3(m_previous_cr3);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -190,15 +190,6 @@ private:
|
||||||
bool m_quickmap_in_use { false };
|
bool m_quickmap_in_use { false };
|
||||||
};
|
};
|
||||||
|
|
||||||
class ProcessPagingScope {
|
|
||||||
public:
|
|
||||||
explicit ProcessPagingScope(Process&);
|
|
||||||
~ProcessPagingScope();
|
|
||||||
|
|
||||||
private:
|
|
||||||
u32 m_previous_cr3 { 0 };
|
|
||||||
};
|
|
||||||
|
|
||||||
template<typename Callback>
|
template<typename Callback>
|
||||||
void VMObject::for_each_region(Callback callback)
|
void VMObject::for_each_region(Callback callback)
|
||||||
{
|
{
|
||||||
|
|
46
Kernel/VM/ProcessPagingScope.cpp
Normal file
46
Kernel/VM/ProcessPagingScope.cpp
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* 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 HOLDER 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <Kernel/VM/MemoryManager.h>
|
||||||
|
#include <Kernel/VM/ProcessPagingScope.h>
|
||||||
|
|
||||||
|
namespace Kernel {
|
||||||
|
|
||||||
|
ProcessPagingScope::ProcessPagingScope(Process& process)
|
||||||
|
{
|
||||||
|
ASSERT(Thread::current);
|
||||||
|
m_previous_cr3 = read_cr3();
|
||||||
|
MM.enter_process_paging_scope(process);
|
||||||
|
}
|
||||||
|
|
||||||
|
ProcessPagingScope::~ProcessPagingScope()
|
||||||
|
{
|
||||||
|
InterruptDisabler disabler;
|
||||||
|
Thread::current->tss().cr3 = m_previous_cr3;
|
||||||
|
write_cr3(m_previous_cr3);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
43
Kernel/VM/ProcessPagingScope.h
Normal file
43
Kernel/VM/ProcessPagingScope.h
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* 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 HOLDER 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AK/Types.h>
|
||||||
|
#include <Kernel/Forward.h>
|
||||||
|
|
||||||
|
namespace Kernel {
|
||||||
|
|
||||||
|
class ProcessPagingScope {
|
||||||
|
public:
|
||||||
|
explicit ProcessPagingScope(Process&);
|
||||||
|
~ProcessPagingScope();
|
||||||
|
|
||||||
|
private:
|
||||||
|
u32 m_previous_cr3 { 0 };
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue