RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 22:17:42 +00:00
Code Issues Activity Actions

Kernel: Remove a bunch of unnecessary InterruptDisablers.

Browse source
This commit is contained in:
Andreas Kling 2019-02-07 11:24:09 +01:00
parent 5582a0a254
commit dc7f257c01
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Kernel/Process.cpp
View file

@ -165,7 +165,6 @@ void* Process::sys$mmap(const Syscall::SC_mmap_params* params)
if ((dword)addr & ~PAGE_MASK || size & ~PAGE_MASK) if ((dword)addr & ~PAGE_MASK || size & ~PAGE_MASK)
return (void*)-EINVAL; return (void*)-EINVAL;
if (flags & MAP_ANONYMOUS) { if (flags & MAP_ANONYMOUS) {
InterruptDisabler disabler;
// FIXME: Implement mapping at a client-specified address. Most of the support is already in plcae. // FIXME: Implement mapping at a client-specified address. Most of the support is already in plcae.
ASSERT(addr == nullptr); ASSERT(addr == nullptr);
auto* region = allocate_region(LinearAddress(), size, "mmap", prot & PROT_READ, prot & PROT_WRITE, false); auto* region = allocate_region(LinearAddress(), size, "mmap", prot & PROT_READ, prot & PROT_WRITE, false);
@ -193,7 +192,6 @@ void* Process::sys$mmap(const Syscall::SC_mmap_params* params)
int Process::sys$munmap(void* addr, size_t size) int Process::sys$munmap(void* addr, size_t size)
{ {
InterruptDisabler disabler;
auto* region = region_from_range(LinearAddress((dword)addr), size); auto* region = region_from_range(LinearAddress((dword)addr), size);
if (!region) if (!region)
return -1; return -1;
@ -325,7 +323,6 @@ int Process::do_exec(const String& path, Vector<String>&& arguments, Vector<Stri
ASSERT(success); ASSERT(success);
{ {
InterruptDisabler disabler;
// Okay, here comes the sleight of hand, pay close attention.. // Okay, here comes the sleight of hand, pay close attention..
auto old_regions = move(m_regions); auto old_regions = move(m_regions);
ELFLoader loader(region->laddr().as_ptr()); ELFLoader loader(region->laddr().as_ptr());
@ -702,8 +699,10 @@ Process::Process(String&& name, uid_t uid, gid_t gid, pid_t ppid, RingLevel ring
Process::~Process() Process::~Process()
{ {
InterruptDisabler disabler; {
system.nprocess--; InterruptDisabler disabler;
system.nprocess--;
}
if (g_last_fpu_process == this) if (g_last_fpu_process == this)
g_last_fpu_process = nullptr; g_last_fpu_process = nullptr;
@ -758,12 +757,12 @@ void Process::send_signal(byte signal, Process* sender)
ASSERT_INTERRUPTS_DISABLED(); ASSERT_INTERRUPTS_DISABLED();
ASSERT(signal < 32); ASSERT(signal < 32);
m_pending_signals |= 1 << signal;
if (sender) if (sender)
dbgprintf("signal: %s(%u) sent %d to %s(%u)\n", sender->name().characters(), sender->pid(), signal, name().characters(), pid()); dbgprintf("signal: %s(%u) sent %d to %s(%u)\n", sender->name().characters(), sender->pid(), signal, name().characters(), pid());
else else
dbgprintf("signal: kernel sent %d to %s(%u)\n", signal, name().characters(), pid()); dbgprintf("signal: kernel sent %d to %s(%u)\n", signal, name().characters(), pid());
m_pending_signals |= 1 << signal;
} }
bool Process::has_unmasked_pending_signals() const bool Process::has_unmasked_pending_signals() const
@ -1414,8 +1413,11 @@ int Process::sys$kill(pid_t pid, int signal)
ASSERT(pid != -1); ASSERT(pid != -1);
} }
ASSERT(pid != current->pid()); // FIXME: Support this scenario. ASSERT(pid != current->pid()); // FIXME: Support this scenario.
InterruptDisabler disabler; Process* peer = nullptr;
auto* peer = Process::from_pid(pid); {
InterruptDisabler disabler;
peer = Process::from_pid(pid);
}
if (!peer) if (!peer)
return -ESRCH; return -ESRCH;
peer->send_signal(signal, this); peer->send_signal(signal, this);
@ -1453,7 +1455,6 @@ int Process::sys$gettimeofday(timeval* tv)
{ {
if (!validate_write_typed(tv)) if (!validate_write_typed(tv))
return -EFAULT; return -EFAULT;
InterruptDisabler disabler;
auto now = RTC::now(); auto now = RTC::now();
tv->tv_sec = now; tv->tv_sec = now;
tv->tv_usec = PIT::ticks_since_boot() % 1000; tv->tv_usec = PIT::ticks_since_boot() % 1000;
@ -1635,8 +1636,6 @@ bool Process::validate_read_from_kernel(LinearAddress laddr) const
{ {
// We check extra carefully here since the first 4MB of the address space is identity-mapped. // We check extra carefully here since the first 4MB of the address space is identity-mapped.
// This code allows access outside of the known used address ranges to get caught. // This code allows access outside of the known used address ranges to get caught.
InterruptDisabler disabler;
if (check_kernel_memory_access(laddr, false)) if (check_kernel_memory_access(laddr, false))
return true; return true;
if (is_kmalloc_address(laddr.as_ptr())) if (is_kmalloc_address(laddr.as_ptr()))
@ -1848,7 +1847,7 @@ int Process::sys$sigaction(int signum, const sigaction* act, sigaction* old_act)
return -EINVAL; return -EINVAL;
if (!validate_read_typed(act)) if (!validate_read_typed(act))
return -EFAULT; return -EFAULT;
InterruptDisabler disabler; // FIXME: This should use a narrower lock. InterruptDisabler disabler; // FIXME: This should use a narrower lock. Maybe a way to ignore signals temporarily?
auto& action = m_signal_action_data[signum]; auto& action = m_signal_action_data[signum];
if (old_act) { if (old_act) {
if (!validate_write_typed(old_act)) if (!validate_write_typed(old_act))