From e32b6fa920e7300d16c190c1138dd042a9df7ea2 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 13 Nov 2020 13:11:45 +0100 Subject: sys/linux: regenerate const files Regenerate consts on upstream 585e5b17b92dead8a3aca4e3c9876fbca5f7e0ba. Fix vmw_vmci.txt const extraction. --- sys/linux/dev_kvm.txt.const | 4 ++-- sys/linux/fs_fuse.txt.const | 2 +- sys/linux/sys.txt.const | 2 +- sys/linux/vmw_vmci.txt | 15 +++++++++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/linux/dev_kvm.txt.const b/sys/linux/dev_kvm.txt.const index 13d87caef..7ff6e6921 100644 --- a/sys/linux/dev_kvm.txt.const +++ b/sys/linux/dev_kvm.txt.const @@ -2,7 +2,7 @@ arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x AT_FDCWD = 18446744073709551516, arm:riscv64:??? KVM_ARM_SET_DEVICE_ADDR = 1074835115, arm:riscv64:???, mips64le:ppc64le:2148576939 -KVM_ARM_TARGET_AEM_V8 = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:??? +KVM_ARM_TARGET_AEM_V8 = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, arm64:0 KVM_ARM_TARGET_CORTEX_A53 = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, arm64:4 KVM_ARM_TARGET_CORTEX_A57 = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, arm64:2 KVM_ARM_TARGET_FOUNDATION_V8 = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, arm64:1 @@ -11,7 +11,7 @@ KVM_ARM_TARGET_XGENE_POTENZA = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, KVM_ARM_VCPU_EL1_32BIT = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, arm64:1 KVM_ARM_VCPU_INIT = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, arm64:1075883694 KVM_ARM_VCPU_PMU_V3 = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, arm64:3 -KVM_ARM_VCPU_POWER_OFF = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:??? +KVM_ARM_VCPU_POWER_OFF = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, arm64:0 KVM_ARM_VCPU_PSCI_0_2 = 386:amd64:arm:mips64le:ppc64le:riscv64:s390x:???, arm64:2 KVM_ASSIGN_DEV_IRQ = 1077980784, arm:riscv64:???, mips64le:ppc64le:2151722608 KVM_ASSIGN_PCI_DEVICE = 2151722601, arm:riscv64:???, mips64le:ppc64le:1077980777 diff --git a/sys/linux/fs_fuse.txt.const b/sys/linux/fs_fuse.txt.const index 13044a2de..bfdb9a549 100644 --- a/sys/linux/fs_fuse.txt.const +++ b/sys/linux/fs_fuse.txt.const @@ -23,7 +23,7 @@ FUSE_FLOCK_LOCKS = 1024 FUSE_HANDLE_KILLPRIV = 524288 FUSE_HAS_IOCTL_DIR = 2048 FUSE_IOCTL_RETRY = 4 -FUSE_KERNEL_MINOR_VERSION = 31 +FUSE_KERNEL_MINOR_VERSION = 32 FUSE_KERNEL_VERSION = 7 FUSE_MAX_PAGES = 4194304 FUSE_MIN_READ_BUFFER = 8192 diff --git a/sys/linux/sys.txt.const b/sys/linux/sys.txt.const index 9adc7bac0..0991efd1c 100644 --- a/sys/linux/sys.txt.const +++ b/sys/linux/sys.txt.const @@ -704,7 +704,7 @@ __NR_pread64 = 180, amd64:17, arm64:riscv64:67, mips64le:5016, ppc64le:179 __NR_preadv = 69, 386:333, amd64:295, arm:361, mips64le:5289, ppc64le:320, s390x:328 __NR_preadv2 = 286, 386:378, amd64:327, arm:392, mips64le:5321, ppc64le:380, s390x:376 __NR_prlimit64 = 261, 386:340, amd64:302, arm:369, mips64le:5297, ppc64le:325, s390x:334 -__NR_process_madvise = 441, mips64le:5441 +__NR_process_madvise = 440, mips64le:5440 __NR_process_vm_readv = 270, 386:347, amd64:310, arm:376, mips64le:5304, ppc64le:351, s390x:340 __NR_process_vm_writev = 271, 386:348, amd64:311, arm:377, mips64le:5305, ppc64le:352, s390x:341 __NR_pselect6 = 72, 386:308, amd64:270, arm:335, mips64le:5260, ppc64le:280, s390x:301 diff --git a/sys/linux/vmw_vmci.txt b/sys/linux/vmw_vmci.txt index e1afdfabf..44ba2de03 100644 --- a/sys/linux/vmw_vmci.txt +++ b/sys/linux/vmw_vmci.txt @@ -1,8 +1,10 @@ # Copyright 2020 syzkaller project authors. All rights reserved. # Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +include include include +include resource fd_vmci[fd] @@ -128,3 +130,16 @@ vmci_version = VMCI_VERSION_NOVMVM, VMCI_VERSION_NOTIFY, VMCI_VERSION_HOSTQP, VM vmci_cpt_state = VMCI_NOTIFICATION_CPT_STATE, VMCI_WELLKNOWN_CPT_STATE, VMCI_DG_OUT_STATE, VMCI_DG_IN_STATE, VMCI_DG_IN_SIZE_STATE, VMCI_DOORBELL_CPT_STATE vmci_notify_resource = VMCI_NOTIFY_RESOURCE_QUEUE_PAIR, VMCI_NOTIFY_RESOURCE_DOOR_BELL vmci_notify_action = VMCI_NOTIFY_RESOURCE_ACTION_NOTIFY, VMCI_NOTIFY_RESOURCE_ACTION_CREATE, VMCI_NOTIFY_RESOURCE_ACTION_DESTROY + +# These are defined in kernel source files. +define VMCI_NOTIFICATION_CPT_STATE 1 +define VMCI_WELLKNOWN_CPT_STATE 2 +define VMCI_DG_OUT_STATE 3 +define VMCI_DG_IN_STATE 4 +define VMCI_DG_IN_SIZE_STATE 5 +define VMCI_DOORBELL_CPT_STATE 6 +define VMCI_NOTIFY_RESOURCE_ACTION_NOTIFY 0 +define VMCI_NOTIFY_RESOURCE_ACTION_CREATE 1 +define VMCI_NOTIFY_RESOURCE_ACTION_DESTROY 2 +define VMCI_NOTIFY_RESOURCE_QUEUE_PAIR 0 +define VMCI_NOTIFY_RESOURCE_DOOR_BELL 1 -- cgit mrf-deployment