* Port previous ethernet scheme

* Add ipd

* Fix initfs rebuilds, use QEMU user networking addresses in ipd

* Add tcp/udp, netutils, dns, and network config

* Add fsync to network driver

* Add dns, router, subnet by default

* Fix e1000 driver. Make ethernet and IP non-blocking to avoid deadlocks

* Add orbital server, WIP

* Add futex

* Add orbutils and orbital

* Update libstd, orbutils, and orbital
Move ANSI key encoding to vesad

* Add orbital assets

* Update orbital

* Update to add login manager

* Add blocking primitives, block for most things except waitpid, update orbital

* Wait in waitpid and IRQ, improvements for other waits

* Fevent in root scheme

* WIP: Switch to using fevent

* Reorganize

* Event based e1000d driver

* Superuser-only access to some network schemes, display, and disk

* Superuser root and irq schemes

* Fix orbital
This commit is contained in:
Jeremy Soller 2016-10-13 17:21:42 -06:00 • committed by GitHub
commit 224c43f761
92 changed files with 3418 additions and 476 deletions

12
.gitmodules vendored
View file

@ -28,3 +28,15 @@
[submodule "programs/userutils"]
path = programs/userutils
url = https://github.com/redox-os/userutils.git
[submodule "programs/netutils"]
path = programs/netutils
url = https://github.com/redox-os/netutils.git
[submodule "schemes/orbital"]
path = schemes/orbital
url = https://github.com/redox-os/orbital.git
[submodule "programs/orbutils"]
path = programs/orbutils
url = https://github.com/redox-os/orbutils.git
[submodule "filesystem/ui"]
path = filesystem/ui
url = https://github.com/redox-os/orbdata.git

View file

@ -17,7 +17,7 @@ CARGO=RUSTC="$(RUSTC)" cargo
CARGOFLAGS=--target $(TARGET).json -- -C opt-level=s --cfg redox
# Default targets
.PHONY: all clean qemu bochs FORCE
.PHONY: all clean qemu bochs drivers schemes coreutils extrautils netutils userutils wireshark FORCE
all: $(KBUILD)/harddrive.bin
@ -25,6 +25,7 @@ clean:
cargo clean
cargo clean --manifest-path libstd/Cargo.toml
cargo clean --manifest-path drivers/ahcid/Cargo.toml
cargo clean --manifest-path drivers/e1000d/Cargo.toml
cargo clean --manifest-path drivers/ps2d/Cargo.toml
cargo clean --manifest-path drivers/pcid/Cargo.toml
cargo clean --manifest-path drivers/vesad/Cargo.toml
@ -32,10 +33,17 @@ clean:
cargo clean --manifest-path programs/ion/Cargo.toml
cargo clean --manifest-path programs/coreutils/Cargo.toml
cargo clean --manifest-path programs/extrautils/Cargo.toml
cargo clean --manifest-path programs/netutils/Cargo.toml
cargo clean --manifest-path programs/orbutils/Cargo.toml
cargo clean --manifest-path programs/userutils/Cargo.toml
cargo clean --manifest-path programs/smith/Cargo.toml
cargo clean --manifest-path schemes/ethernetd/Cargo.toml
cargo clean --manifest-path schemes/example/Cargo.toml
cargo clean --manifest-path schemes/ipd/Cargo.toml
cargo clean --manifest-path schemes/orbital/Cargo.toml
cargo clean --manifest-path schemes/redoxfs/Cargo.toml
cargo clean --manifest-path schemes/tcpd/Cargo.toml
cargo clean --manifest-path schemes/udpd/Cargo.toml
rm -rf initfs/bin
rm -rf filesystem/bin
rm -rf build
@ -118,7 +126,7 @@ $(KBUILD)/librustc_unicode.rlib: rust/src/librustc_unicode/lib.rs $(KBUILD)/libc
$(KBUILD)/libcollections.rlib: rust/src/libcollections/lib.rs $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/librustc_unicode.rlib
$(KRUSTC) $(KRUSTCFLAGS) -o $@ $<
$(KBUILD)/libkernel.a: kernel/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs FORCE
$(KBUILD)/libkernel.a: kernel/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs
$(KCARGO) rustc $(KCARGOFLAGS) -C opt-level=s -C lto -o $@
$(KBUILD)/kernel: $(KBUILD)/libkernel.a
@ -170,17 +178,12 @@ initfs/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
strip $@
rm $@.d
initfs_drivers: \
initfs/bin/ahcid \
initfs/bin/pcid
initfs_schemes: \
initfs/bin/redoxfs
$(BUILD)/initfs.rs: \
initfs/bin/init \
initfs_drivers \
initfs_schemes
initfs/bin/ahcid \
initfs/bin/pcid \
initfs/bin/redoxfs \
initfs/etc/**
echo 'use collections::BTreeMap;' > $@
echo 'pub fn gen() -> BTreeMap<&'"'"'static [u8], (&'"'"'static [u8], bool)> {' >> $@
echo ' let mut files: BTreeMap<&'"'"'static [u8], (&'"'"'static [u8], bool)> = BTreeMap::new();' >> $@
@ -218,6 +221,18 @@ filesystem/bin/%: programs/extrautils/Cargo.toml programs/extrautils/src/bin/%.r
strip $@
rm $@.d
filesystem/bin/%: programs/netutils/Cargo.toml programs/netutils/src/%/**.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@
rm $@.d
filesystem/bin/%: programs/orbutils/Cargo.toml programs/orbutils/src/%/**.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@
rm $@.d
filesystem/bin/%: programs/userutils/Cargo.toml programs/userutils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
@ -278,6 +293,23 @@ extrautils: \
filesystem/bin/rem \
#filesystem/bin/dmesg filesystem/bin/info filesystem/bin/man filesystem/bin/watch
netutils: \
filesystem/bin/dhcpd \
filesystem/bin/dnsd \
filesystem/bin/irc \
filesystem/bin/nc \
filesystem/bin/wget
orbutils: \
filesystem/bin/calculator \
filesystem/bin/character_map \
filesystem/bin/editor \
filesystem/bin/file_manager \
filesystem/bin/launcher \
filesystem/bin/orblogin \
filesystem/bin/terminal \
filesystem/bin/viewer
userutils: \
filesystem/bin/getty \
filesystem/bin/id \
@ -286,28 +318,35 @@ userutils: \
filesystem/bin/sudo
schemes: \
filesystem/bin/example
filesystem/bin/ethernetd \
filesystem/bin/example \
filesystem/bin/ipd \
filesystem/bin/orbital \
filesystem/bin/tcpd \
filesystem/bin/udpd
$(BUILD)/filesystem.bin: \
drivers \
coreutils \
extrautils \
netutils \
orbutils \
userutils \
schemes \
filesystem/bin/ion \
filesystem/bin/smith
rm -rf $@ $(BUILD)/filesystem/
echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 8
echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 64
mkdir -p $(BUILD)/filesystem/
cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-fuse $@ $(BUILD)/filesystem/ &
sleep 2
-cp -RL filesystem/* $(BUILD)/filesystem/
-chown -R 0:0 $(BUILD)/filesystem/
-chown -R 1000:1000 $(BUILD)/filesystem/home/user/
-chmod 700 $(BUILD)/filesystem/root/
-chmod 700 $(BUILD)/filesystem/home/user/
-chmod +s $(BUILD)/filesystem/bin/su
-chmod +s $(BUILD)/filesystem/bin/sudo
cp -RL filesystem/* $(BUILD)/filesystem/
chown -R 0:0 $(BUILD)/filesystem/
chown -R 1000:1000 $(BUILD)/filesystem/home/user/
chmod 700 $(BUILD)/filesystem/root/
chmod 700 $(BUILD)/filesystem/home/user/
chmod +s $(BUILD)/filesystem/bin/su
chmod +s $(BUILD)/filesystem/bin/sudo
sync
-fusermount -u $(BUILD)/filesystem/
rm -rf $(BUILD)/filesystem/
@ -321,3 +360,6 @@ unmount: FORCE
sync
-fusermount -u $(KBUILD)/harddrive/
rm -rf $(KBUILD)/harddrive/
wireshark: FORCE
wireshark $(KBUILD)/network.pcap

View file

@ -4,5 +4,5 @@ version = "0.1.0"
[dependencies]
bitflags = "*"
hole_list_allocator = { path = "../../alloc/hole_list_allocator"}
hole_list_allocator = { path = "../../crates/hole_list_allocator"}
spin = "*"

View file

@ -4,10 +4,10 @@ version = "0.1.0"
[dependencies]
bitflags = "*"
hole_list_allocator = { path = "../../alloc/hole_list_allocator" }
io = { path = "../../drivers/io" }
hole_list_allocator = { path = "../../crates/hole_list_allocator/" }
io = { path = "../../crates/io/" }
spin = "*"
[dependencies.x86]
version = "*"
version = "0.7"
default-features = false

View file

@ -1,11 +1,11 @@
use spin::Mutex;
use x86::io;
use device::serial::{COM1, COM2};
use time;
pub static ACKS: Mutex<[usize; 16]> = Mutex::new([0; 16]);
pub static COUNTS: Mutex<[usize; 16]> = Mutex::new([0; 16]);
extern {
fn irq_trigger(irq: u8);
}
#[inline(always)]
unsafe fn master_ack() {
@ -27,7 +27,7 @@ pub unsafe fn acknowledge(irq: usize) {
}
interrupt!(pit, {
COUNTS.lock()[0] += 1;
irq_trigger(0);
{
const PIT_RATE: u64 = 46500044;
@ -42,76 +42,74 @@ interrupt!(pit, {
});
interrupt!(keyboard, {
COUNTS.lock()[1] += 1;
irq_trigger(1);
});
interrupt!(cascade, {
COUNTS.lock()[2] += 1;
irq_trigger(2);
master_ack();
});
interrupt!(com2, {
COUNTS.lock()[3] += 1;
irq_trigger(3);
COM2.lock().on_receive();
master_ack();
});
interrupt!(com1, {
COUNTS.lock()[4] += 1;
irq_trigger(4);
COM1.lock().on_receive();
master_ack();
});
interrupt!(lpt2, {
COUNTS.lock()[5] += 1;
irq_trigger(5);
master_ack();
});
interrupt!(floppy, {
COUNTS.lock()[6] += 1;
irq_trigger(6);
master_ack();
});
interrupt!(lpt1, {
COUNTS.lock()[7] += 1;
irq_trigger(7);
master_ack();
});
interrupt!(rtc, {
COUNTS.lock()[8] += 1;
irq_trigger(8);
slave_ack();
});
interrupt!(pci1, {
COUNTS.lock()[9] += 1;
irq_trigger(9);
slave_ack();
});
interrupt!(pci2, {
COUNTS.lock()[10] += 1;
slave_ack();
irq_trigger(10);
});
interrupt!(pci3, {
COUNTS.lock()[11] += 1;
slave_ack();
irq_trigger(11);
});
interrupt!(mouse, {
COUNTS.lock()[12] += 1;
irq_trigger(12);
});
interrupt!(fpu, {
COUNTS.lock()[13] += 1;
irq_trigger(13);
slave_ack();
});
interrupt!(ata1, {
COUNTS.lock()[14] += 1;
irq_trigger(14);
slave_ack();
});
interrupt!(ata2, {
COUNTS.lock()[15] += 1;
irq_trigger(15);
slave_ack();
});

View file

@ -148,7 +148,7 @@ pub unsafe extern fn kstart_ap(cpu_id: usize, _page_table: usize, stack_start: u
let kernel_table = KERNEL_TABLE.load(Ordering::SeqCst);
// Initialize paging
let (active_table, tcb_offset) = paging::init_ap(cpu_id, stack_start, stack_end, kernel_table);
let (_active_table, tcb_offset) = paging::init_ap(cpu_id, stack_start, stack_end, kernel_table);
// Set up GDT for AP
gdt::init(tcb_offset, stack_end);

View file

@ -115,8 +115,8 @@ vesa:
.minx dw 640
.miny dw 480
.required:
.requiredx dw 0 ; 1024 ;USE THESE WITH CAUTION
.requiredy dw 0 ; 768
.requiredx dw 1024 ;USE THESE WITH CAUTION
.requiredy dw 768
.requiredmode dw 0
.modeok db ": Is this OK?(y/n)",10,13,0

View file

@ -1,36 +0,0 @@
#[macro_use]
extern crate cake;
const QEMU: &'static str = "qemu-system-x86_64";
const LS_FLAGS: &'static [&'static str] = &["-a", "/"];
build! {
// ---- COMMANDS ----
start(harddrive) => {},
list(kernel_list) => {},
run(bochs) => {},
clean() => cmd!("rm", "-rf", "build/*"),
// ---- RECIPES ----
bochs(harddrive) => cmd!("bochs", "-f", "bochs.x86_64"),
qemu(harddrive) => cmd!(QEMU,
"-serial", "mon:stdio",
"-drive", "file=build/harddrive.bin,format=raw,index=0,media=disk"),
libkernel() => cmd!("cargo", "rustc", "--", "-C", "lto"),
kernel(libkernel) => cmd!("ld",
"-m", "elf_x86_64",
"--gc-sections",
"-z", "max-page-size=0x1000",
"-T bootloader/x86/kernel.ld",
"-o", "build/kernel.in", "build/libkernel.a"),
kernel_list(kernel) => cmd!("objdump",
"-C", "-M", "intel",
"-D", "build/kernel.bin",
">", "build/kernel.list"),
harddrive(kernel) => cmd!("nasm",
"-f", "bin",
"-o", "build/harddrive.bin",
"-D", "ARCH_x86_64", "-ibootloader/x86/", "-ibuild/",
"bootloader/x86/harddrive.asm"),
}

6
crates/event/Cargo.toml Normal file
View file

@ -0,0 +1,6 @@
[package]
name = "event"
version = "0.1.0"
[dependencies.syscall]
path = "../../syscall/"

55
crates/event/src/lib.rs Normal file
View file

@ -0,0 +1,55 @@
#![feature(question_mark)]
extern crate syscall;
use std::collections::BTreeMap;
use std::fs::File;
use std::io::{Read, Error, Result};
use std::os::unix::io::RawFd;
pub struct EventQueue<R> {
/// The file to read events from
file: File,
/// A map of registered file descriptors to their handler callbacks
callbacks: BTreeMap<RawFd, Box<FnMut(usize) -> Result<Option<R>>>>
}
impl<R> EventQueue<R> {
/// Create a new event queue
pub fn new() -> Result<EventQueue<R>> {
Ok(EventQueue {
file: File::open("event:")?,
callbacks: BTreeMap::new()
})
}
/// Add a file to the event queue, calling a callback when an event occurs
///
/// The callback is given a mutable reference to the file and the event data
/// (typically the length of data available for read)
///
/// The callback returns Ok(None) if it wishes to continue the event loop,
/// or Ok(Some(R)) to break the event loop and return the value.
/// Err can be used to allow the callback to return an I/O error, and break the
/// event loop
pub fn add<F: FnMut(usize) -> Result<Option<R>> + 'static>(&mut self, fd: RawFd, callback: F) -> Result<()> {
syscall::fevent(fd, syscall::EVENT_READ).map_err(|x| Error::from_sys(x))?;
self.callbacks.insert(fd, Box::new(callback));
Ok(())
}
/// Process the event queue until a callback returns Some(R)
pub fn run(&mut self) -> Result<R> {
loop {
let mut event = syscall::Event::default();
self.file.read(&mut event)?;
if let Some(callback) = self.callbacks.get_mut(&event.id) {
if let Some(ret) = callback(event.data)? {
return Ok(ret);
}
}
}
}
}

View file

@ -0,0 +1,6 @@
[package]
name = "resource_scheme"
version = "0.1.0"
[dependencies.syscall]
path = "../../syscall/"

Some files were not shown because too many files have changed in this diff Show more