Move syscall related stuff to syscall.py

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index fd4553ffbbbf722cf18035f68a9d1bd28e245c13..892601a822b185f772612ee719d5a7f3f3b0fe4f 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -106,6 +106,7 @@ from .backend import (
     write_grub_config,
 )
 from .manifest import Manifest
+from .syscall import ioctl_partition_add, ioctl_partition_remove, reflink
 
 complete_step = MkosiPrinter.complete_step
 
@@ -540,37 +541,6 @@ def format_bytes(num_bytes: int) -> str:
     return f"{num_bytes}B"
 
 
-_IOC_NRBITS   =  8  # NOQA: E221,E222
-_IOC_TYPEBITS =  8  # NOQA: E221,E222
-_IOC_SIZEBITS = 14  # NOQA: E221,E222
-_IOC_DIRBITS  =  2  # NOQA: E221,E222
-
-_IOC_NRSHIFT   = 0  # NOQA: E221
-_IOC_TYPESHIFT = _IOC_NRSHIFT + _IOC_NRBITS  # NOQA: E221
-_IOC_SIZESHIFT = _IOC_TYPESHIFT + _IOC_TYPEBITS  # NOQA: E221
-_IOC_DIRSHIFT  = _IOC_SIZESHIFT + _IOC_SIZEBITS  # NOQA: E221
-
-_IOC_NONE  = 0  # NOQA: E221
-_IOC_WRITE = 1  # NOQA: E221
-_IOC_READ  = 2  # NOQA: E221
-
-
-def _IOC(dir_rw: int, type_drv: int, nr: int, argtype: Optional[str] = None) -> int:
-    size = {"int": 4, "size_t": 8}[argtype] if argtype else 0
-    return dir_rw << _IOC_DIRSHIFT | type_drv << _IOC_TYPESHIFT | nr << _IOC_NRSHIFT | size << _IOC_SIZESHIFT
-
-
-def _IOW(type_drv: int, nr: int, size: str) -> int:
-    return _IOC(_IOC_WRITE, type_drv, nr, size)
-
-
-def _IO(type_drv: int, nr: int) -> int:
-    return _IOC(_IOC_NONE, type_drv, nr)
-
-
-FICLONE = _IOW(0x94, 9, "int")
-
-
 @contextlib.contextmanager
 def open_close(path: PathString, flags: int, mode: int = 0o664) -> Iterator[int]:
     fd = os.open(path, flags | os.O_CLOEXEC, mode)
@@ -580,13 +550,9 @@ def open_close(path: PathString, flags: int, mode: int = 0o664) -> Iterator[int]
         os.close(fd)
 
 
-def _reflink(oldfd: int, newfd: int) -> None:
-    fcntl.ioctl(newfd, FICLONE, oldfd)
-
-
 def copy_fd(oldfd: int, newfd: int) -> None:
     try:
-        _reflink(oldfd, newfd)
+        reflink(oldfd, newfd)
     except OSError as e:
         if e.errno not in {errno.EXDEV, errno.EOPNOTSUPP, errno.ENOTTY}:
             raise
@@ -596,7 +562,7 @@ def copy_fd(oldfd: int, newfd: int) -> None:
 
 def copy_file_object(oldobject: BinaryIO, newobject: BinaryIO) -> None:
     try:
-        _reflink(oldobject.fileno(), newobject.fileno())
+        reflink(oldobject.fileno(), newobject.fileno())
     except OSError as e:
         if e.errno not in {errno.EXDEV, errno.EOPNOTSUPP, errno.ENOTTY}:
             raise
@@ -947,53 +913,6 @@ def reuse_cache_image(
     return f, True
 
 
-BLKPG = _IO(0x12, 105)
-BLKPG_ADD_PARTITION = 1
-BLKPG_DEL_PARTITION = 2
-
-
-class blkpg_ioctl_arg(ctypes.Structure):
-    _fields_ = [
-        ('op', ctypes.c_int),
-        ('flags', ctypes.c_int),
-        ('datalen', ctypes.c_int),
-        ('data', ctypes.c_void_p),
-    ]
-
-
-class blkpg_partition(ctypes.Structure):
-    _fields_ = [
-        ('start', ctypes.c_longlong),
-        ('length', ctypes.c_longlong),
-        ('pno', ctypes.c_int),
-        ('devname', ctypes.c_char * 64),
-        ('volname', ctypes.c_char * 64),
-    ]
-
-
-def ioctl_partition_add(fd: int, nr: int, start: int, size: int) -> None:
-    bp = blkpg_partition(pno=nr, start=start, length=size)
-    ba = blkpg_ioctl_arg(op=BLKPG_ADD_PARTITION, data=ctypes.addressof(bp), datalen=ctypes.sizeof(bp))
-    try:
-        fcntl.ioctl(fd, BLKPG, ba)
-    except OSError as e:
-        # EBUSY means the kernel has already initialized the partition device.
-        if e.errno != errno.EBUSY:
-            raise
-
-
-def ioctl_partition_remove(fd: int, nr: int) -> None:
-    bp = blkpg_partition(pno=nr)
-    ba = blkpg_ioctl_arg(op=BLKPG_DEL_PARTITION, data=ctypes.addressof(bp), datalen=ctypes.sizeof(bp))
-    try:
-        fcntl.ioctl(fd, BLKPG, ba)
-    except OSError as e:
-        if e.errno != errno.EBUSY:
-            raise
-        else:
-            warn("Got EBUSY from the kernel while trying to remove partition, ignoring")
-
-
 @contextlib.contextmanager
 def attach_image_loopback(image: Optional[BinaryIO], table: Optional[PartitionTable]) -> Iterator[Optional[Path]]:
     if image is None:

diff --git a/mkosi/syscall.py b/mkosi/syscall.py
new file mode 100644 (file)
index 0000000..f7cfce2
--- /dev/null
+++ b/mkosi/syscall.py
@@ -0,0 +1,85 @@
+# SPDX-License-Identifier: LGPL-2.1+
+
+import ctypes
+import errno
+import fcntl
+from typing import Optional
+
+_IOC_NRBITS   =  8  # NOQA: E221,E222
+_IOC_TYPEBITS =  8  # NOQA: E221,E222
+_IOC_SIZEBITS = 14  # NOQA: E221,E222
+_IOC_DIRBITS  =  2  # NOQA: E221,E222
+
+_IOC_NRSHIFT   = 0  # NOQA: E221
+_IOC_TYPESHIFT = _IOC_NRSHIFT + _IOC_NRBITS  # NOQA: E221
+_IOC_SIZESHIFT = _IOC_TYPESHIFT + _IOC_TYPEBITS  # NOQA: E221
+_IOC_DIRSHIFT  = _IOC_SIZESHIFT + _IOC_SIZEBITS  # NOQA: E221
+
+_IOC_NONE  = 0  # NOQA: E221
+_IOC_WRITE = 1  # NOQA: E221
+_IOC_READ  = 2  # NOQA: E221
+
+
+def _IOC(dir_rw: int, type_drv: int, nr: int, argtype: Optional[str] = None) -> int:
+    size = {"int": 4, "size_t": 8}[argtype] if argtype else 0
+    return dir_rw << _IOC_DIRSHIFT | type_drv << _IOC_TYPESHIFT | nr << _IOC_NRSHIFT | size << _IOC_SIZESHIFT
+
+
+def _IOW(type_drv: int, nr: int, size: str) -> int:
+    return _IOC(_IOC_WRITE, type_drv, nr, size)
+
+
+def _IO(type_drv: int, nr: int) -> int:
+    return _IOC(_IOC_NONE, type_drv, nr)
+
+
+BLKPG = _IO(0x12, 105)
+BLKPG_ADD_PARTITION = 1
+BLKPG_DEL_PARTITION = 2
+
+
+class blkpg_ioctl_arg(ctypes.Structure):
+    _fields_ = [
+        ('op', ctypes.c_int),
+        ('flags', ctypes.c_int),
+        ('datalen', ctypes.c_int),
+        ('data', ctypes.c_void_p),
+    ]
+
+
+class blkpg_partition(ctypes.Structure):
+    _fields_ = [
+        ('start', ctypes.c_longlong),
+        ('length', ctypes.c_longlong),
+        ('pno', ctypes.c_int),
+        ('devname', ctypes.c_char * 64),
+        ('volname', ctypes.c_char * 64),
+    ]
+
+
+def ioctl_partition_add(fd: int, nr: int, start: int, size: int) -> None:
+    bp = blkpg_partition(pno=nr, start=start, length=size)
+    ba = blkpg_ioctl_arg(op=BLKPG_ADD_PARTITION, data=ctypes.addressof(bp), datalen=ctypes.sizeof(bp))
+    try:
+        fcntl.ioctl(fd, BLKPG, ba)
+    except OSError as e:
+        # EBUSY means the kernel has already initialized the partition device.
+        if e.errno != errno.EBUSY:
+            raise
+
+
+def ioctl_partition_remove(fd: int, nr: int) -> None:
+    bp = blkpg_partition(pno=nr)
+    ba = blkpg_ioctl_arg(op=BLKPG_DEL_PARTITION, data=ctypes.addressof(bp), datalen=ctypes.sizeof(bp))
+    try:
+        fcntl.ioctl(fd, BLKPG, ba)
+    except OSError as e:
+        if e.errno != errno.EBUSY:
+            raise
+
+
+FICLONE = _IOW(0x94, 9, "int")
+
+
+def reflink(oldfd: int, newfd: int) -> None:
+    fcntl.ioctl(newfd, FICLONE, oldfd)