add lock support for libos mode

drivers/Cargo.toml

@@ -15,7 +15,6 @@ virtio = ["virtio-drivers"]
 [dependencies]
 log = "0.4"
 spin = "0.9"
-lock = { git = "https://github.com/DeathWish5/kernel-sync" }
 cfg-if = "1.0"
 bitflags = "1.3"
 lazy_static = "1.4"
@@ -27,10 +26,13 @@ rcore-console = { git = "https://github.com/rcore-os/rcore-console", default-fea
 # smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp", rev = "35e833e3", default-features = false, features = ["log", "alloc", "verbose", "proto-ipv4", "proto-ipv6", "proto-igmp", "medium-ip", "medium-ethernet", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp"] }
 smoltcp = { git = "https://gitee.com/gcyyfun/smoltcp", rev="043eb60", default-features = false, features = ["alloc","log", "async", "medium-ethernet","proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] }
 
+# LibOS mode
 [target.'cfg(not(target_os = "none"))'.dependencies]
 async-std = { version = "1.10", optional = true }
 sdl2 = { version = "0.34", optional = true }
 
+[target.'cfg(target_os = "none")'.dependencies]
+
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 acpi = "4.1"
 x2apic = "0.4"

drivers/src/input/mouse.rs

@@ -1,6 +1,6 @@
 use alloc::{boxed::Box, sync::Arc};
 
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use crate::prelude::{CapabilityType, InputEvent, InputEventType};
 use crate::scheme::{impl_event_scheme, InputScheme};

drivers/src/irq/riscv_intc.rs

@@ -1,6 +1,6 @@
 use riscv::register::sie;
 // use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 use spin::Once;
 
 use crate::prelude::IrqHandler;

drivers/src/irq/riscv_plic.rs

@@ -2,7 +2,7 @@ use core::arch::asm;
 use core::ops::Range;
 
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use crate::io::{Io, Mmio};
 use crate::prelude::IrqHandler;

drivers/src/irq/x86_apic/ioapic.rs

@@ -4,7 +4,7 @@ use core::{fmt, ptr::NonNull};
 use acpi::platform::interrupt::InterruptModel;
 use acpi::{AcpiHandler, AcpiTables, PhysicalMapping};
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 use x2apic::ioapic::{IoApic as IoApicInner, IrqFlags, IrqMode};
 
 use super::{IrqPolarity, IrqTriggerMode, Phys2VirtFn};

drivers/src/irq/x86_apic/mod.rs

@@ -5,7 +5,7 @@ mod lapic;
 use core::ops::Range;
 
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use self::consts::{X86_INT_BASE, X86_INT_LOCAL_APIC_BASE};
 use self::ioapic::{IoApic, IoApicList};

drivers/src/mock/uart.rs

@@ -2,7 +2,7 @@ use std::collections::VecDeque;
 
 use async_std::{io, io::prelude::*, task};
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use crate::scheme::{impl_event_scheme, Scheme, UartScheme};
 use crate::utils::EventListener;

drivers/src/net/loopback.rs

@@ -8,7 +8,7 @@ use alloc::string::String;
 use spin::Mutex;
 
 // TODO: fix this, should use no-irq lock, but can't pass build of libos
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use crate::scheme::{NetScheme, Scheme};
 use crate::{DeviceError, DeviceResult};

drivers/src/net/mod.rs

@@ -64,7 +64,7 @@ pub use loopback::LoopbackInterface;
 use alloc::sync::Arc;
 use alloc::vec;
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use smoltcp::socket::SocketSet;
 

drivers/src/net/rtlx.rs

@@ -4,7 +4,7 @@ use alloc::sync::Arc;
 use alloc::vec;
 use alloc::vec::Vec;
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use smoltcp::iface::*;
 use smoltcp::phy::{self, Device, DeviceCapabilities, Medium};

drivers/src/uart/buffered.rs

@@ -1,7 +1,7 @@
 use alloc::{boxed::Box, collections::VecDeque, string::String, sync::Arc};
 
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use crate::scheme::{impl_event_scheme, Scheme, UartScheme};
 use crate::utils::EventListener;

drivers/src/uart/uart_16550.rs

@@ -3,7 +3,7 @@ use core::ops::{BitAnd, BitOr, Not};
 
 use bitflags::bitflags;
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use crate::io::{Io, Mmio, ReadOnly};
 use crate::scheme::{impl_event_scheme, Scheme, UartScheme};

drivers/src/utils/event_listener.rs

@@ -1,7 +1,7 @@
 use alloc::{boxed::Box, vec::Vec};
 
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 pub type EventHandler<T = ()> = Box<dyn Fn(&T) + Send + Sync>;
 

drivers/src/virtio/blk.rs

@@ -1,5 +1,5 @@
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 use virtio_drivers::{VirtIOBlk as InnerDriver, VirtIOHeader};
 
 use crate::scheme::{BlockScheme, Scheme};

drivers/src/virtio/console.rs

@@ -1,7 +1,7 @@
 use core::fmt::{Result, Write};
 
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 use virtio_drivers::{VirtIOConsole as InnerDriver, VirtIOHeader};
 
 use crate::prelude::DeviceResult;

drivers/src/virtio/gpu.rs

@@ -1,5 +1,5 @@
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 use virtio_drivers::{VirtIOGpu as InnerDriver, VirtIOHeader};
 
 use crate::prelude::{ColorFormat, DisplayInfo, FrameBuffer};

drivers/src/virtio/input.rs

@@ -1,7 +1,7 @@
 use core::convert::TryFrom;
 
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 use virtio_drivers::{InputConfigSelect, VirtIOHeader, VirtIOInput as InnerDriver};
 
 use crate::prelude::{CapabilityType, InputCapability, InputEvent, InputEventType};

kernel-hal/Cargo.toml

@@ -16,7 +16,6 @@ graphic = ["zcore-drivers/graphic"]
 [dependencies]
 log = "0.4"
 spin = "0.9"
-lock = { git = "https://github.com/DeathWish5/kernel-sync" }
 cfg-if = "1.0"
 bitflags = "1.3"
 trapframe = "0.9.0"
@@ -33,11 +32,13 @@ nix = { version = "0.23", optional = true }
 tempfile = { version = "3", optional = true }
 async-std = { version = "1.10", optional = true }
 bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "b3f9f51", optional = true }
+lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
 
 # Bare-metal mode
 [target.'cfg(target_os = "none")'.dependencies]
 executor = { git = "https://github.com/DeathWish5/PreemptiveScheduler" }
 naive-timer = "0.2.0"
+lock = { git = "https://github.com/DeathWish5/kernel-sync" }
 
 # All mode on x86_64
 [target.'cfg(target_arch = "x86_64")'.dependencies]

kernel-hal/src/bare/arch/riscv/vm.rs

@@ -5,7 +5,7 @@ use core::slice;
 
 use riscv::{asm, register::satp};
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use crate::utils::page_table::{GenericPTE, PageTableImpl, PageTableLevel3};
 use crate::{mem::phys_to_virt, MMUFlags, PhysAddr, VirtAddr, KCONFIG};

kernel-hal/src/bare/net.rs

@@ -12,7 +12,7 @@ use alloc::sync::Arc;
 
 use alloc::string::String;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use crate::drivers::add_device;
 use crate::drivers::all_net;

kernel-hal/src/bare/timer.rs

@@ -6,7 +6,7 @@ use core::time::Duration;
 use naive_timer::Timer;
 // use spin::Mutex;
 use core::sync::atomic::{AtomicBool, Ordering};
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 #[allow(dead_code)]
 pub(super) const TICKS_PER_SEC: u64 = 100;

kernel-hal/src/common/console.rs

@@ -3,7 +3,7 @@
 use crate::drivers;
 use core::fmt::{Arguments, Result, Write};
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 struct SerialWriter;
 

kernel-hal/src/drivers.rs

@@ -4,7 +4,7 @@ use alloc::{sync::Arc, vec::Vec};
 use core::convert::From;
 
 // use spin::{RwLock, RwLockReadGuard};
-use lock::rwlock::{RwLock, RwLockReadGuard};
+use lock::{RwLock, RwLockReadGuard};
 
 use zcore_drivers::scheme::{
     BlockScheme, DisplayScheme, InputScheme, IrqScheme, NetScheme, Scheme, UartScheme,

kernel-hal/src/libos/mem.rs

@@ -5,7 +5,7 @@ use core::ops::Range;
 
 use bitmap_allocator::BitAlloc;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use super::mock_mem::MockMemory;
 use crate::{PhysAddr, VirtAddr, PAGE_SIZE};

kernel-hal/src/libos/net.rs

@@ -12,7 +12,7 @@ use alloc::sync::Arc;
 
 use alloc::string::String;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use crate::drivers::add_device;
 use crate::drivers::all_net;

kernel-hal/src/utils/page_table.rs

@@ -7,7 +7,7 @@ use crate::common::vm::*;
 use crate::{mem::PhysFrame, MMUFlags, PhysAddr, VirtAddr};
 
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 pub trait PageTableLevel: Sync + Send {
     const LEVEL: usize;

linux-object/Cargo.toml

@@ -11,7 +11,6 @@ description = "Linux kernel objects"
 async-trait = "0.1"
 log = "0.4"
 spin = "0.9"
-lock = { git = "https://github.com/DeathWish5/kernel-sync" }
 xmas-elf = "0.7"
 bitflags = "1.3"
 hashbrown = "0.9"

linux-object/src/fs/devfs/input/event.rs

@@ -3,7 +3,7 @@ use core::task::{Context, Poll};
 use core::{any::Any, future::Future, mem::size_of, pin::Pin};
 
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use kernel_hal::drivers::prelude::{InputEvent, InputEventType};
 use kernel_hal::drivers::scheme::InputScheme;

linux-object/src/fs/devfs/input/mice.rs

@@ -3,7 +3,7 @@ use core::task::{Context, Poll};
 use core::{any::Any, future::Future, pin::Pin};
 
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use kernel_hal::drivers::prelude::input::{Mouse, MouseFlags, MouseState};
 use kernel_hal::drivers::scheme::{EventScheme, InputScheme};

linux-object/src/fs/devfs/random.rs

@@ -6,7 +6,7 @@ use core::any::Any;
 use rcore_fs::vfs::*;
 use rcore_fs_devfs::DevFS;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 /// random INode data struct
 pub struct RandomINodeData {

linux-object/src/fs/device.rs

@@ -2,7 +2,7 @@
 
 use rcore_fs::dev::{Device, Result};
 // use spin::RwLock;
-use lock::rwlock::RwLock;
+use lock::RwLock;
 
 /// memory buffer for device
 pub struct MemBuf(RwLock<&'static mut [u8]>);

linux-object/src/fs/file.rs

@@ -4,7 +4,7 @@ use alloc::{boxed::Box, string::String, sync::Arc};
 
 use async_trait::async_trait;
 use spin::RwLock;
-// use lock::rwlock::RwLock;
+// use lock::RwLock;
 
 use rcore_fs::vfs::{FileType, FsError, INode, Metadata, PollStatus};
 use zircon_object::object::*;

linux-object/src/fs/pipe.rs

@@ -11,7 +11,7 @@ use core::{
 };
 use rcore_fs::vfs::*;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 #[derive(Clone, PartialEq)]
 #[allow(dead_code)]

linux-object/src/fs/rcore_fs_wrapper.rs

@@ -8,7 +8,7 @@ extern crate rcore_fs;
 use kernel_hal::drivers::scheme::BlockScheme;
 use rcore_fs::dev::{BlockDevice, DevError, Device, Result};
 use spin::RwLock;
-// use lock::rwlock::RwLock;
+// use lock::RwLock;
 
 /// A naive LRU cache layer for `BlockDevice`, re-exported from `rcore-fs`.
 pub use rcore_fs::dev::block_cache::BlockCache;

linux-object/src/fs/stdio.rs

@@ -14,7 +14,7 @@ use kernel_hal::console::{self, ConsoleWinSize};
 use lazy_static::lazy_static;
 use rcore_fs::vfs::*;
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 lazy_static! {
     /// STDIN global reference

linux-object/src/ipc/mod.rs

@@ -9,7 +9,7 @@ use alloc::collections::BTreeMap;
 use alloc::sync::Arc;
 use bitflags::*;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 /// Semaphore table in a process
 #[derive(Default)]

linux-object/src/net/mod.rs

@@ -14,7 +14,7 @@ pub mod udp;
 pub use udp::*;
 
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 /// missing documentation
 // pub mod raw;

linux-object/src/net/tcp.rs

@@ -16,7 +16,7 @@ use crate::net::TCP_RECVBUF;
 use crate::net::TCP_SENDBUF;
 use alloc::sync::Arc;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 // alloc
 use alloc::boxed::Box;

linux-object/src/net/udp.rs

@@ -24,7 +24,7 @@ use crate::net::UDP_METADATA_BUF;
 use crate::net::UDP_RECVBUF;
 use crate::net::UDP_SENDBUF;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 // alloc
 use alloc::boxed::Box;

linux-object/src/sync/event_bus.rs

@@ -10,7 +10,7 @@ use core::{
     task::{Context, Poll},
 };
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 bitflags! {
     #[derive(Default)]

linux-object/src/sync/semaphore.rs

@@ -12,7 +12,7 @@ use core::ops::Deref;
 use core::pin::Pin;
 use core::task::{Context, Poll};
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 /// A counting, blocking, semaphore.
 pub struct Semaphore {

linux-syscall/Cargo.toml

@@ -10,7 +10,6 @@ description = "Linux syscalls implementation"
 [dependencies]
 log = "0.4"
 spin = "0.9"
-lock = { git = "https://github.com/DeathWish5/kernel-sync" }
 bitflags = "1.3"
 numeric-enum-macro = "0.2"
 zircon-object = { path = "../zircon-object" }
@@ -19,3 +18,11 @@ kernel-hal = { path = "../kernel-hal", default-features = false }
 rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec" }
 lazy_static = { version = "1.4", features = ["spin_no_std"] }
 bitvec = { version = "0.22", default-features = false, features = ["alloc"] }
+
+# LibOS mode
+[target.'cfg(not(target_os = "none"))'.dependencies]
+lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
+
+# Bare-metal mode
+[target.'cfg(target_os = "none")'.dependencies]
+lock = { git = "https://github.com/DeathWish5/kernel-sync" }

linux-syscall/src/net.rs

@@ -7,7 +7,7 @@ use linux_object::net::TcpSocketState;
 use linux_object::net::UdpSocketState;
 
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 impl Syscall<'_> {
     /// net socket

zCore/Cargo.toml

@@ -45,7 +45,6 @@ board-d1 = ["link-user-img"]
 [dependencies]
 log = "0.4"
 spin = "0.9"
-lock = { git = "https://github.com/DeathWish5/kernel-sync" }
 cfg-if = "1.0"
 lazy_static = { version = "1.4", features = ["spin_no_std" ] }
 bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "b3f9f51" }
@@ -61,11 +60,13 @@ rcore-fs-sfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec",
 async-std = { version = "1.10", optional = true }
 chrono = { version = "0.4", optional = true }
 rcore-fs-hostfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec", optional = true }
+lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"]}
 
 # Bare-metal mode
 [target.'cfg(target_os = "none")'.dependencies]
 buddy_system_allocator = "0.7"
 executor = { git = "https://github.com/DeathWish5/PreemptiveScheduler" }
+lock = { git = "https://github.com/DeathWish5/kernel-sync" }
 
 # Bare-metal mode on x86_64
 [target.'cfg(all(target_os = "none", target_arch = "x86_64"))'.dependencies]

zCore/src/memory.rs

@@ -5,7 +5,7 @@ use core::ops::Range;
 use bitmap_allocator::BitAlloc;
 use kernel_hal::PhysAddr;
 // use spin::Mutex;
-use lock::mutex::Mutex;
+use lock::Mutex;
 
 use super::platform::consts::*;
 

zircon-object/Cargo.toml

@@ -15,7 +15,6 @@ elf = ["xmas-elf"]
 [dependencies]
 bitflags = "1.3"
 spin = "0.9"
-lock = { git = "https://github.com/DeathWish5/kernel-sync" }
 log = "0.4"
 hashbrown = "0.9"
 downcast-rs = { version = "1.2", default-features = false }
@@ -30,3 +29,11 @@ cfg-if = "1.0"
 
 [dev-dependencies]
 async-std = { version = "1.10", features = ["attributes", "unstable"] }
+
+# LibOS mode
+[target.'cfg(not(target_os = "none"))'.dependencies]
+lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
+
+# Bare-metal mode
+[target.'cfg(target_os = "none")'.dependencies]
+lock = { git = "https://github.com/DeathWish5/kernel-sync" }

zircon-object/src/debuglog.rs

@@ -5,7 +5,7 @@ use {
     alloc::{sync::Arc, vec::Vec},
     lazy_static::lazy_static,
     spin::Mutex,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
 };
 
 lazy_static! {

zircon-object/src/dev/bti.rs

@@ -5,7 +5,7 @@ use {
     alloc::{sync::Arc, vec::Vec},
     dev::Iommu,
     spin::Mutex,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
 };
 
 /// Bus Transaction Initiator.

zircon-object/src/dev/interrupt/event_interrupt.rs

@@ -2,7 +2,7 @@ use kernel_hal::interrupt;
 use {
     super::*,
     spin::Mutex,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
 };
 
 pub struct EventInterrupt {

zircon-object/src/dev/interrupt/mod.rs

@@ -8,7 +8,7 @@ use {
     alloc::{boxed::Box, sync::Arc},
     bitflags::bitflags,
     spin::Mutex,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
 };
 
 mod event_interrupt;

zircon-object/src/dev/interrupt/pci_interrupt.rs

@@ -1,6 +1,6 @@
 use alloc::{boxed::Box, sync::Arc};
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use super::InterruptTrait;
 use crate::dev::pci::{constants::PCIE_IRQRET_MASK, IPciNode};

zircon-object/src/dev/pci/bus.rs

@@ -18,7 +18,7 @@ use core::marker::{Send, Sync};
 use lazy_static::*;
 use region_alloc::RegionAllocator;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 /// PCIE Bus Driver.
 pub struct PCIeBusDriver {

zircon-object/src/dev/pci/caps.rs

@@ -5,7 +5,7 @@ use alloc::boxed::Box;
 use core::convert::TryFrom;
 use kernel_hal::interrupt;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 /// Enumeration for PCI capabilities.
 #[derive(Debug)]

zircon-object/src/dev/pci/pio.rs

@@ -14,7 +14,7 @@ cfg_if::cfg_if! {
 if #[cfg(all(target_arch = "x86_64", target_os = "none"))] {
 use kernel_hal::x86_64::{Io, Pio};
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
     static PIO_LOCK: Mutex<()> = Mutex::new(());
     const PCI_CONFIG_ADDR: u16 = 0xcf8;

zircon-object/src/hypervisor/vcpu.rs

@@ -9,7 +9,7 @@ use {
     core::convert::TryInto,
     rvm::{self, Vcpu as VcpuInner},
     spin::Mutex,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
 };
 
 /// Virtual CPU within a Guest, which allows for execution within the virtual machine.

zircon-object/src/ipc/channel.rs

@@ -8,7 +8,7 @@ use {
     futures::channel::oneshot::{self, Sender},
     hashbrown::HashMap,
     spin::Mutex,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
 };
 
 /// Bidirectional interprocess communication

zircon-object/src/ipc/fifo.rs

@@ -3,7 +3,7 @@ use {
     alloc::collections::VecDeque,
     alloc::sync::{Arc, Weak},
     spin::Mutex,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
 };
 
 /// First-In First-Out inter-process queue.

zircon-object/src/ipc/socket.rs

@@ -3,7 +3,7 @@ use {
     alloc::collections::VecDeque,
     alloc::sync::{Arc, Weak},
     bitflags::bitflags,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
     spin::Mutex,
 };
 

zircon-object/src/object/mod.rs

@@ -105,7 +105,7 @@ use {
         task::{Context, Poll},
     },
     downcast_rs::{impl_downcast, DowncastSync},
-    // lock::mutex::Mutex,
+    // lock::Mutex,
     spin::Mutex,
 };
 

zircon-object/src/signal/futex.rs

@@ -7,7 +7,7 @@ use core::pin::Pin;
 use core::sync::atomic::*;
 use core::task::{Context, Poll, Waker};
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 /// A primitive for creating userspace synchronization tools.
 ///

zircon-object/src/signal/port.rs

@@ -5,7 +5,7 @@ use alloc::collections::{BTreeSet, VecDeque};
 use alloc::sync::Arc;
 use bitflags::bitflags;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 #[path = "port_packet.rs"]
 mod port_packet;

zircon-object/src/signal/timer.rs

@@ -4,7 +4,7 @@ use alloc::boxed::Box;
 use alloc::sync::Arc;
 use core::time::Duration;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 /// An object that may be signaled at some point in the future
 ///

zircon-object/src/task/exception.rs

@@ -4,7 +4,7 @@ use core::mem::size_of;
 use futures::channel::oneshot;
 use kernel_hal::context::{TrapReason, UserContext};
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use super::{Job, Task, Thread};
 use crate::ipc::{Channel, MessagePacket};

zircon-object/src/task/job.rs

@@ -6,7 +6,7 @@ use {
     crate::task::Task,
     alloc::sync::{Arc, Weak},
     alloc::vec::Vec,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
     spin::Mutex,
 };
 

zircon-object/src/task/process.rs

@@ -4,7 +4,7 @@ use core::{any::Any, sync::atomic::AtomicI32};
 use futures::channel::oneshot::{self, Receiver, Sender};
 use hashbrown::HashMap;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use super::exception::{ExceptionChannelType, Exceptionate};
 use super::job_policy::{JobPolicy, PolicyAction, PolicyCondition};

zircon-object/src/task/thread.rs

@@ -11,7 +11,7 @@ use bitflags::bitflags;
 use futures::{channel::oneshot::*, future::FutureExt, pin_mut, select_biased};
 use kernel_hal::context::UserContext;
 use spin::Mutex;
-// use lock::mutex::Mutex;
+// use lock::Mutex;
 
 use self::thread_state::ContextAccessState;
 use super::{exception::*, Process, Task};

zircon-object/src/vm/stream.rs

@@ -3,7 +3,7 @@ use {
     crate::object::*,
     alloc::sync::Arc,
     numeric_enum_macro::numeric_enum,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
     spin::Mutex,
 };
 

zircon-object/src/vm/vmar.rs

@@ -6,7 +6,7 @@ use {
     kernel_hal::vm::{
         GenericPageTable, IgnoreNotMappedErr, Page, PageSize, PageTable, PagingError, PagingResult,
     },
-    lock::mutex::Mutex,
+    lock::Mutex,
     // spin::Mutex,
 };
 

zircon-object/src/vm/vmo/mod.rs

@@ -9,7 +9,7 @@ use {
     bitflags::bitflags,
     core::ops::Deref,
     kernel_hal::CachePolicy,
-    // lock::mutex::Mutex,
+    // lock::Mutex,
     spin::Mutex,
 };
 

zircon-object/src/vm/vmo/physical.rs

@@ -1,7 +1,7 @@
 use {
     super::*,
     alloc::sync::Arc,
-    lock::mutex::Mutex,
+    lock::Mutex,
     // spin::Mutex,
 };
 

zircon-syscall/Cargo.toml

@@ -14,10 +14,17 @@ deny-page-fault = []
 [dependencies]
 log = "0.4"
 spin = "0.9"
-lock = { git = "https://github.com/DeathWish5/kernel-sync" }
 bitflags = "1.3"
 numeric-enum-macro = "0.2"
 zircon-object = { path = "../zircon-object" }
 kernel-hal = { path = "../kernel-hal", default-features = false }
 futures = { version = "0.3", default-features = false, features = ["alloc", "async-await"] }
 cfg-if = "1.0"
+
+# LibOS mode
+[target.'cfg(not(target_os = "none"))'.dependencies]
+lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
+
+# Bare-metal mode
+[target.'cfg(target_os = "none")'.dependencies]
+lock = { git = "https://github.com/DeathWish5/kernel-sync" }

zircon-syscall/src/channel.rs

@@ -1,7 +1,7 @@
 use {
     super::*,
     alloc::{string::String, vec::Vec},
-    // lock::mutex::Mutex,
+    // lock::Mutex,
     spin::Mutex,
     zircon_object::{
         ipc::{Channel, MessagePacket},