summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-03-23 08:37:01 +0000
committerbors <bors@rust-lang.org>2023-03-23 08:37:01 +0000
commitac1cb39736812e44b8964a1adadc3979107636ba (patch)
treec78207946ba4d4ae50c315c4342aeac90929356b
parent57760b3aaf5e151599fb1e724fd14c2f4c86ba2f (diff)
parente1f48361a5fca04fbd7e6440a1ae56730d9db6cb (diff)
downloadrust-libc-ac1cb39736812e44b8964a1adadc3979107636ba.tar.gz
Auto merge of #3156 - ribalda:kexec, r=JohnTitor
linux: add kexec flags This adds `KEXEC_ARCH_MASK`, `KEXEC_FILE_NO_INITRAMFS`, `KEXEC_FILE_ON_CRASH`, `KEXEC_FILE_UNLOAD`, `KEXEC_ON_CRASH`, and `KEXEC_PRESERVE_CONTEXT` constants on Linux and Android. Those are used by `kexec` and `kexec_file_load` syscalls.
-rw-r--r--libc-test/build.rs3
-rw-r--r--libc-test/semver/android.txt6
-rw-r--r--libc-test/semver/linux.txt6
-rw-r--r--src/unix/linux_like/android/mod.rs8
-rw-r--r--src/unix/linux_like/linux/mod.rs8
5 files changed, 31 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs
index 33558a9345..b9b3cbd27c 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -1631,6 +1631,7 @@ fn test_android(target: &str) {
"linux/if_link.h",
"linux/rtnetlink.h",
"linux/if_tun.h",
+ "linux/kexec.h",
"linux/magic.h",
"linux/membarrier.h",
"linux/memfd.h",
@@ -3250,6 +3251,7 @@ fn test_linux(target: &str) {
"linux/if_tun.h",
"linux/input.h",
"linux/ipv6.h",
+ "linux/kexec.h",
"linux/keyctl.h",
"linux/magic.h",
"linux/memfd.h",
@@ -3464,6 +3466,7 @@ fn test_linux(target: &str) {
|| name.starts_with("F_")
|| name.starts_with("FALLOC_FL_")
|| name.starts_with("IFLA_")
+ || name.starts_with("KEXEC_")
|| name.starts_with("MS_")
|| name.starts_with("MSG_")
|| name.starts_with("OPEN_TREE_")
diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
index d0017b846c..16570b0b61 100644
--- a/libc-test/semver/android.txt
+++ b/libc-test/semver/android.txt
@@ -1032,6 +1032,12 @@ IXANY
IXOFF
IXON
JFFS2_SUPER_MAGIC
+KEXEC_ARCH_MASK
+KEXEC_FILE_NO_INITRAMFS
+KEXEC_FILE_ON_CRASH
+KEXEC_FILE_UNLOAD
+KEXEC_ON_CRASH
+KEXEC_PRESERVE_CONTEXT
KEY_CNT
KEY_MAX
LC_ADDRESS
diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
index cdb0079144..95f8178e5e 100644
--- a/libc-test/semver/linux.txt
+++ b/libc-test/semver/linux.txt
@@ -1185,6 +1185,12 @@ J1939_PGN_MAX
J1939_PGN_PDU1_MAX
J1939_PGN_REQUEST
KERNEL_VERSION
+KEXEC_ARCH_MASK
+KEXEC_FILE_NO_INITRAMFS
+KEXEC_FILE_ON_CRASH
+KEXEC_FILE_UNLOAD
+KEXEC_ON_CRASH
+KEXEC_PRESERVE_CONTEXT
KEYCTL_ASSUME_AUTHORITY
KEYCTL_CHOWN
KEYCTL_CLEAR
diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
index ca2938ac22..e2fa0826f2 100644
--- a/src/unix/linux_like/android/mod.rs
+++ b/src/unix/linux_like/android/mod.rs
@@ -1606,6 +1606,14 @@ pub const AI_ADDRCONFIG: ::c_int = 0x00000400;
pub const AI_V4MAPPED: ::c_int = 0x00000800;
pub const AI_DEFAULT: ::c_int = AI_V4MAPPED_CFG | AI_ADDRCONFIG;
+// linux/kexec.h
+pub const KEXEC_ON_CRASH: ::c_int = 0x00000001;
+pub const KEXEC_PRESERVE_CONTEXT: ::c_int = 0x00000002;
+pub const KEXEC_ARCH_MASK: ::c_int = 0xffff0000;
+pub const KEXEC_FILE_UNLOAD: ::c_int = 0x00000001;
+pub const KEXEC_FILE_ON_CRASH: ::c_int = 0x00000002;
+pub const KEXEC_FILE_NO_INITRAMFS: ::c_int = 0x00000004;
+
pub const LINUX_REBOOT_MAGIC1: ::c_int = 0xfee1dead;
pub const LINUX_REBOOT_MAGIC2: ::c_int = 672274793;
pub const LINUX_REBOOT_MAGIC2A: ::c_int = 85072278;
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
index 1d272d601d..36b2d7878e 100644
--- a/src/unix/linux_like/linux/mod.rs
+++ b/src/unix/linux_like/linux/mod.rs
@@ -3550,6 +3550,14 @@ pub fn FUTEX_OP(op: ::c_int, oparg: ::c_int, cmp: ::c_int, cmparg: ::c_int) -> :
((op & 0xf) << 28) | ((cmp & 0xf) << 24) | ((oparg & 0xfff) << 12) | (cmparg & 0xfff)
}
+// linux/kexec.h
+pub const KEXEC_ON_CRASH: ::c_int = 0x00000001;
+pub const KEXEC_PRESERVE_CONTEXT: ::c_int = 0x00000002;
+pub const KEXEC_ARCH_MASK: ::c_int = 0xffff0000;
+pub const KEXEC_FILE_UNLOAD: ::c_int = 0x00000001;
+pub const KEXEC_FILE_ON_CRASH: ::c_int = 0x00000002;
+pub const KEXEC_FILE_NO_INITRAMFS: ::c_int = 0x00000004;
+
// linux/reboot.h
pub const LINUX_REBOOT_MAGIC1: ::c_int = 0xfee1dead;
pub const LINUX_REBOOT_MAGIC2: ::c_int = 672274793;