Skip to content

Insert the correct address into the allocations map #179

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

Merged
SamTebbs33 merged 3 commits into from
Jul 6, 2020
Merged

Insert the correct address into the allocations map #179

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91a0f66
Insert the correct address into the allocations map
SamTebbs33 Jun 30, 2020
9a408dc
Add test for correct address
SamTebbs33 Jul 6, 2020
febb6c7
Update for new HashMap.get
SamTebbs33 Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/kernel/vmm.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ pub fn VirtualMemoryManager(comptime Payload: type) type {
try phys_list.append(phys);
}
}
_ = try self.allocations.put(virt, Allocation{ .physical = phys_list });
_ = try self.allocations.put(virtual.start, Allocation{ .physical = phys_list });
}

///
Expand Down Expand Up @@ -310,15 +310,15 @@ pub fn VirtualMemoryManager(comptime Payload: type) type {
/// Bitmap.BitmapError.OutOfBounds - The address is out of the manager's bounds
///
pub fn free(self: *Self, vaddr: usize) (bitmap.Bitmap(u32).BitmapError || VmmError)!void {
const entry = vaddr / BLOCK_SIZE;
const entry = (vaddr - self.start) / BLOCK_SIZE;
if (try self.bmp.isSet(entry)) {
// There will be an allocation associated with this virtual address
const allocation = self.allocations.get(vaddr) orelse unreachable;
const physical = allocation.physical;
defer physical.deinit();
const num_physical_allocations = physical.items.len;
for (physical.items) |block, i| {
// Clear the address space entry, unmap the virtual memory and free the physical memory
// Clear the address space entry and free the physical memory
try self.bmp.clearEntry(entry + i);
pmm.free(block) catch |e| panic(@errorReturnTrace(), "Failed to free PMM reserved memory at 0x{X}: {}\n", .{ block * BLOCK_SIZE, e });
}
Expand Down Expand Up @@ -469,6 +469,8 @@ test "set" {
const pend = vend + 123;
const attrs = Attributes{ .kernel = true, .writable = true, .cachable = true };
try vmm.set(.{ .start = vstart, .end = vend }, mem.Range{ .start = pstart, .end = pend }, attrs);
// Make sure it put the correct address in the map
std.testing.expect(vmm.allocations.get(vstart) != null);

var allocations = test_allocations orelse unreachable;
// The entries before the virtual start shouldn't be set
Expand Down