aboutsummaryrefslogtreecommitdiffstats
path: root/sys/fuchsia
diff options
context:
space:
mode:
authorAleksandr Nogikh <nogikh@google.com>2022-08-23 09:27:01 +0000
committerAleksandr Nogikh <wp32pw@gmail.com>2022-08-23 11:51:37 +0200
commitcea8b0f72c56f0c82a465154bb7412407e78dcd8 (patch)
treed8403b6e6bb3443ddf4daf3739daf5f823916f6c /sys/fuchsia
parent26a13b3872cf54f3e68ec48a93c9866423fc3304 (diff)
all: revert "sys/fuchsia: update system calls for bti, cache, iommu, pmt, and process (#3321)"
This has broken our CI tests: fatal error: 'lib/ddk/driver.h' file not found That's indeed an error and it needs to be fixed, but for now it just stops syzkaller development.
Diffstat (limited to 'sys/fuchsia')
-rw-r--r--sys/fuchsia/bti.txt17
-rw-r--r--sys/fuchsia/cache.txt10
-rw-r--r--sys/fuchsia/ddk.txt4
-rw-r--r--sys/fuchsia/iommu.txt12
-rw-r--r--sys/fuchsia/pmt.txt10
-rw-r--r--sys/fuchsia/process.txt22
-rw-r--r--sys/fuchsia/processes.txt13
7 files changed, 17 insertions, 71 deletions
diff --git a/sys/fuchsia/bti.txt b/sys/fuchsia/bti.txt
deleted file mode 100644
index c8cccb0c8..000000000
--- a/sys/fuchsia/bti.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022 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.
-
-# See: https://cs.opensource.google/fuchsia/fuchsia/+/main:zircon/vdso/bti.fidl
-
-include <zircon/syscalls.h>
-
-resource zx_bti[zx_handle]
-
-zx_bti_create(iommu zx_iommu, options flags[bti_create_options], bti_id int64, bti ptr[out, zx_bti])
-
-zx_bti_pin(handle zx_bti, options flags[bti_pin_options], vmo zx_vmo, offset int64, size int64, addrs ptr[out, array[intptr]], num_addrs len[addrs], pmt ptr[out, zx_pmt])
-
-zx_bti_release_quarantine(bti zx_bti)
-
-bti_create_options = 0
-bti_pin_options = ZX_BTI_PERM_READ, ZX_BTI_PERM_WRITE, ZX_BTI_PERM_EXECUTE, ZX_BTI_COMPRESS, ZX_BTI_CONTIGUOUS
diff --git a/sys/fuchsia/cache.txt b/sys/fuchsia/cache.txt
deleted file mode 100644
index e6e750d09..000000000
--- a/sys/fuchsia/cache.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2022 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.
-
-# See: https://cs.opensource.google/fuchsia/fuchsia/+/main:zircon/vdso/cache.fidl
-
-include <zircon/syscalls.h>
-
-zx_cache_flush(addr ptr[in, array[int8]], size len[addr], options flags[cache_flush_options])
-
-cache_flush_options = ZX_CACHE_FLUSH_DATA, ZX_CACHE_FLUSH_INVALIDATE, ZX_CACHE_FLUSH_INSN
diff --git a/sys/fuchsia/ddk.txt b/sys/fuchsia/ddk.txt
index 9a886b1d6..2bc278136 100644
--- a/sys/fuchsia/ddk.txt
+++ b/sys/fuchsia/ddk.txt
@@ -3,3 +3,7 @@
include <zircon/syscalls.h>
include <zircon/types.h>
+
+cache_flush_flags = ZX_CACHE_FLUSH_DATA, ZX_CACHE_FLUSH_INVALIDATE, ZX_CACHE_FLUSH_INSN
+
+zx_cache_flush(addr ptr[out, intptr], size int64, flags flags[cache_flush_flags])
diff --git a/sys/fuchsia/iommu.txt b/sys/fuchsia/iommu.txt
deleted file mode 100644
index f6bcffbbf..000000000
--- a/sys/fuchsia/iommu.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 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.
-
-# See: https://cs.opensource.google/fuchsia/fuchsia/+/main:zircon/vdso/iommu.fidl
-
-include <zircon/syscalls.h>
-
-resource zx_iommu[zx_handle]
-
-zx_iommu_create(handle zx_handle, type flags[iommu_create_type], desc ptr[in, array[int8]], size len[desc], out_handle ptr[out, zx_iommu])
-
-iommu_create_type = ZX_IOMMU_TYPE_DUMMY
diff --git a/sys/fuchsia/pmt.txt b/sys/fuchsia/pmt.txt
deleted file mode 100644
index 7bdd65643..000000000
--- a/sys/fuchsia/pmt.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2022 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.
-
-# See: https://cs.opensource.google/fuchsia/fuchsia/+/main:zircon/vdso/pmt.fidl
-
-include <zircon/syscalls.h>
-
-resource zx_pmt[zx_handle]
-
-zx_pmt_unpin(handle zx_pmt)
diff --git a/sys/fuchsia/process.txt b/sys/fuchsia/process.txt
deleted file mode 100644
index c4e57d175..000000000
--- a/sys/fuchsia/process.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2022 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.
-
-# See: https://cs.opensource.google/fuchsia/fuchsia/+/main:zircon/vdso/process.fidl
-
-include <zircon/syscalls.h>
-
-resource zx_process[zx_handle]
-
-zx_process_exit(ret_code int64)
-
-zx_process_create(job zx_job, name ptr[in, string], name_len len[name], options const[0], proc_handle ptr[out, zx_process], vmar_handle ptr[out, zx_vmar])
-
-zx_process_start$allargs(proc_handle zx_process, thread_handle zx_thread, entry ptr[in, text[target]], stack intptr, arg1 zx_handle, arg2 intptr)
-
-zx_process_start$arg1(proc_handle zx_process, thread_handle zx_thread, entry ptr[in, text[target]], stack intptr, arg1 zx_handle, arg2 const[0])
-
-zx_process_start$arg2(proc_handle zx_process, thread_handle zx_thread, entry ptr[in, text[target]], stack intptr, arg1 const[0], arg2 intptr)
-
-zx_process_read_memory(proc_handle zx_process, vaddr intptr, buffer ptr[out, array[int8]], size len[buffer], actual ptr[out, int64])
-
-zx_process_write_memory(proc_handle zx_process, vaddr intptr, buffer ptr[in, array[int8]], size len[buffer], actual ptr[out, int64])
diff --git a/sys/fuchsia/processes.txt b/sys/fuchsia/processes.txt
new file mode 100644
index 000000000..e6e6b9367
--- /dev/null
+++ b/sys/fuchsia/processes.txt
@@ -0,0 +1,13 @@
+# Copyright 2017 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 <zircon/syscalls.h>
+
+resource zx_process[zx_task]
+
+zx_process_create(job zx_job, name ptr[in, string], name_len len[name], options const[0], proc_handle ptr[out, zx_process], vmar_handle ptr[out, zx_vmar])
+zx_process_read_memory(process zx_process, vaddr ptr[out, int8], buffer ptr[out, array[int8]], len len[buffer], actual ptr[out, intptr])
+zx_process_start(process zx_process, thread zx_thread, entry ptr[in, text[target]], stack ptr[out, array[int8]], arg1 const[0], arg2 const[0])
+# TODO: temporary disabled as it crashes kernel left and right.
+# zx_process_write_memory(process zx_process, vaddr ptr[out, int8], buffer ptr[in, array[int8]], len len[buffer], actual ptr[out, intptr])
+zx_process_exit(ret_code int64)