Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(x86_64::paging): Implement paging & kernel remap #103

Merged
merged 223 commits into from
May 28, 2017
Merged

feat(x86_64::paging): Implement paging & kernel remap #103

merged 223 commits into from
May 28, 2017

Conversation

hawkw
Copy link
Member

@hawkw hawkw commented May 28, 2017

This PR adds a working implementation of paging and remapping the kernel into the high address space on x86_64! 🍾

Note that interrupts had to be re-disabled temporarily because of issues from #78 that I'm still looking into.

This PR also includes a number of changes to the elf and alloc crates that were necessary to get paging working correctly. It doesn't finish the whole "allocator rewrite" project, but it brings us further along.

Paging issues:

Allocator issues:

Also makes some progress on issues #31, #73, #76, and #84.

screen shot 2017-05-28 at 12 41 04 pm

hawkw added 30 commits June 11, 2016 13:23
@hawkw
[notes]
5c8ca5f
@hawkw
Merge pull request #33 from hawkw/master
d3bdafb 
Update paging-dev
@hawkw
[kernel,x86_64] tweak type signature for Addr slightly
eb0f99d
@hawkw
[memory] re-export stuff from arch
06b5ec6
@hawkw
[x86_64, kernel] make Page trait actually work
564a8ec
@hawkw
[kernel] start on making allocator API smarter
cd3eace
@hawkw
[kernel] start implementing smart allocator API
0cd5ea6
@hawkw
[kernel] remove an unused import
f04fad5
@hawkw
[kernel] trying to make new paging types play nice
04f5b03
@hawkw
[memory] Fix unsafe invocations in alloc
fdd533e
@hawkw
[kernel] actually add memory::alloc module
d3ed299
@hawkw
[kernel] Add Arrayvec crate
eaa09ad
@hawkw
[kernel] start on first-fit page frame allocator
f76af96
@hawkw
[kernel, x86_64] made pages Copy + Clone again
789d552
@hawkw
[kernel] start on first fit alloc for page frames
08bc27c
@hawkw
[kernel] add const fns for making addrs into ptrs
e51e9d0
@hawkw
[kernel, x86_64] rename method on mapper, add unmap method
856ea3b
@hawkw
[x86_64] tweaks to pml4
0dce0ef
@hawkw
[x86_64] work on paging
75de965
@hawkw
[x86_64] paging tweaks
4547235 
 + Frame renamed to PhsyicalPage
 + Delete unused Entry module
@hawkw
[kernel, x86_64] remove lots of unneeded generics in paging
4f486f9
@hawkw
[x86_64] implement Mapper::unmap() for PML4
3ec675b
@hawkw
[x86_64] ActivePML4::unmap() flushes the TLB
82792c9
@hawkw
[x86_64] add functions for testing paging
0d476a7
@hawkw
[x86_all] paging tests work better now
15a2d6d
@hawkw
[kernel, x86_64] we can now allocate frames using the kernel heap
72af564 
this implementation is Bad and Needs To Be Fixed
@hawkw
[kernel, x86_64] address types stringify nicely
1089048
@hawkw
[x86_64] add stack space
66045b3
@hawkw
[x86_64] add more tests for unmap
e1babd1
@hawkw
[kernel] remove unused variables warnings for unimplemented fns
9381896
hawkw added 19 commits May 27, 2017 18:41
@hawkw
Merge branch 'double-fault-tss' of github.com:hawkw/sos-kernel into d…
0bc86bb 
…ouble-fault-tss
@hawkw
chore(paging): fix messed up merge (oops)
3681b6f
@hawkw
fix(x86_64/linker.ld): put boot/GDT in a page-aligned ELF section
bc2748b 
This may not be the Right Way to do this, but it works for now &
prevents crashes.
@hawkw
feat(kernel_init): add the new attempt!() macro for nicer init logging
d50a001
@hawkw
fix(x86_64::arch_init): temporary fix for writing NXE bit to IA32_EFER
47d8901 
this is Not Ideal, but it's a temp workaround for bugs in the CPU crate.
@hawkw
fix(alloc::frame::mem_map): MemMapFrameAllocator no longer clones
c067607 
Clone instance on Frame was removed.
@hawkw
feat(vga): panic messages also written to serial, if available
6faec05
@hawkw
fix(cpu::x86_all::control_regs::cr3::write()): add memory clobber
2e9299a
@hawkw
fix(boot): temporarily remove uses of set_flags! macro
e1f6633 
It needs to be double-checked for correctness.
@hawkw
feat(paging::x86_64): add tracing logging to kernel_remap, unmap
bce2c25
@hawkw
fix(paging::x86_64::kernel_remap): minor bugfixes
994c61b
@hawkw
feat(paging::kernel_remap): log important stuff to the VGA log
c6d5367 
So the user can know Something Is Happening!
@hawkw
feat(kernel_init): nicer VGA logging for kernel remap
1c74e0e
@hawkw
fix(paging::x86_64::kernel_remap): fix extra whitespace in log message
85d501d
@hawkw
feat(memory::macros): add PartialEq/PartialOrd<Repr> instances to Addrs
2ad5d41
@hawkw
fix(Page): remove assertions in phys page that only needed to be in virt
0413e36
@hawkw
fix(kernel_init): fix some wonky formatting in kernel_init vga log
7f0375e
@hawkw
chore: remove unused files
575c5bc 
Some of these were deleted a while ago but `git merge` decided we wanted
them back
@hawkw
chore: remove a bunch of dead code
4bd062f
@hawkw hawkw added area/alloc Area: this issue concerns memory allocation. area/elf Area: this issue describes ELF parsing and loading. kind/feature Kind: this issue is a feature. area/kernel Area: this issue relates to the core kernel. arch/x86_64 Architecture: this issue is specific to the x86_64 (amd64) architecture. labels May 28, 2017
@hawkw hawkw added this to the Paging milestone May 28, 2017
@hawkw hawkw self-assigned this May 28, 2017
@hawkw
Copy link
Member Author

hawkw commented May 28, 2017

This should probably increment the version numbers on alloc, paging, memory, elf, and the main kernel. Possibly also cpu -- I should see if any API changes in there are permanent.

@hawkw
Copy link
Member Author

hawkw commented May 28, 2017

Note that this PR adds the paging and params crates, which will add more crates to the task lists on #86 and #102

@hawkw hawkw merged commit 929dd83 into master May 28, 2017
@hawkw hawkw deleted the paging-dev branch June 18, 2017 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@hawkw hawkw

Labels
arch/x86_64 Architecture: this issue is specific to the x86_64 (amd64) architecture. area/alloc Area: this issue concerns memory allocation. area/elf Area: this issue describes ELF parsing and loading. area/kernel Area: this issue relates to the core kernel. kind/feature Kind: this issue is a feature.
Projects
None yet
Milestone
Paging
Development

Successfully merging this pull request may close these issues.
1 participant
@hawkw