Skip to content

vmm: add resize permission to qemu-compatible locking #185

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

Open
arctic-alpaca wants to merge 1 commit into
base: gardenlinux
Choose a base branch
from
Open

vmm: add resize permission to qemu-compatible locking #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions block/src/fcntl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ const QEMU_UNSHARE_LOCK_OFFSET: u64 = 200;
const QEMU_READ_BYTE: u64 = 0;
/// Write permission lock index for QEMU.
const QEMU_WRITE_BYTE: u64 = 1;
/// Resize permission lock index for QEMU.
const QEMU_RESIZE_BYTE: u64 = 3;

/// The granularity of the advisory lock.
///
Expand Down Expand Up @@ -176,15 +178,23 @@ impl LockGranularity {
.flock(libc::F_UNLCK, QEMU_LOCK_OFFSET + QEMU_READ_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_LOCK_OFFSET + QEMU_WRITE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_LOCK_OFFSET + QEMU_RESIZE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_READ_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_WRITE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_RESIZE_BYTE),
],
LockType::Write => vec![],
LockType::Read => vec![
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_LOCK_OFFSET + QEMU_WRITE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_LOCK_OFFSET + QEMU_RESIZE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_RESIZE_BYTE),
],
};

Expand Down Expand Up @@ -213,18 +223,26 @@ impl LockGranularity {
.flock(libc::F_UNLCK, QEMU_LOCK_OFFSET + QEMU_READ_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_LOCK_OFFSET + QEMU_WRITE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_LOCK_OFFSET + QEMU_RESIZE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_READ_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_WRITE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_UNLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_RESIZE_BYTE),
],
LockType::Write => vec![
LockGranularity::QemuCompatible
.flock(libc::F_RDLCK, QEMU_LOCK_OFFSET + QEMU_READ_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_RDLCK, QEMU_LOCK_OFFSET + QEMU_WRITE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_RDLCK, QEMU_LOCK_OFFSET + QEMU_RESIZE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_RDLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_WRITE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_RDLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_RESIZE_BYTE),
],
LockType::Read => vec![
LockGranularity::QemuCompatible
Expand Down Expand Up @@ -303,8 +321,12 @@ impl LockGranularity {
.flock(libc::F_WRLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_READ_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_WRLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_WRITE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_WRLCK, QEMU_UNSHARE_LOCK_OFFSET + QEMU_RESIZE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_WRLCK, QEMU_LOCK_OFFSET + QEMU_WRITE_BYTE),
LockGranularity::QemuCompatible
.flock(libc::F_WRLCK, QEMU_LOCK_OFFSET + QEMU_RESIZE_BYTE),
],
LockType::Read => vec![
LockGranularity::QemuCompatible
Expand Down
3 changes: 2 additions & 1 deletion docs/disk_locking.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ QEMU's file locking semantics.
For read-only disks, this translates to QEMU's `BLK_PERM_CONSISTENT_READ`
with `BLK_PERM_WRITE` unshared.
For read-write disks, this translates to QEMU's `BLK_PERM_CONSISTENT_READ`
and `BLK_PERM_WRITE` with `BLK_PERM_WRITE` unshared.
`BLK_PERM_WRITE` and `BLK_PERM_RESIZE` with `BLK_PERM_WRITE` and
`BLK_PERM_RESIZE` unshared.

### `byte-range`

Expand Down
Loading