|
 |
f03e82 |
commit a53adb79711ccfc76a4ee32b20253045cdab55c7
|
|
|
f03e82 |
Author: Mark Wielaard <mark@klomp.org>
|
|
|
f03e82 |
Date: Mon Jul 27 16:36:17 2020 +0200
|
|
|
f03e82 |
|
|
|
f03e82 |
Handle linux syscalls sched_getattr and sched_setattr
|
|
|
f03e82 |
|
|
|
f03e82 |
The only "special" thing about these syscalls is that the given
|
|
|
f03e82 |
struct sched_attr determines its own size for future expansion.
|
|
|
f03e82 |
|
|
|
f03e82 |
Original fix by "ISHIKAWA,chiaki" <ishikawa@yk.rim.or.jp>
|
|
|
f03e82 |
|
|
|
f03e82 |
https://bugs.kde.org/show_bug.cgi?id=369029
|
|
|
f03e82 |
|
|
|
f03e82 |
diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h
|
|
|
f03e82 |
index cdc73c1e6..eb0b320ca 100644
|
|
|
f03e82 |
--- a/coregrind/m_syswrap/priv_syswrap-linux.h
|
|
|
f03e82 |
+++ b/coregrind/m_syswrap/priv_syswrap-linux.h
|
|
|
f03e82 |
@@ -227,6 +227,8 @@ DECL_TEMPLATE(linux, sys_fremovexattr);
|
|
|
f03e82 |
// syscalls.
|
|
|
f03e82 |
DECL_TEMPLATE(linux, sys_sched_setparam);
|
|
|
f03e82 |
DECL_TEMPLATE(linux, sys_sched_getparam);
|
|
|
f03e82 |
+DECL_TEMPLATE(linux, sys_sched_setattr);
|
|
|
f03e82 |
+DECL_TEMPLATE(linux, sys_sched_getattr);
|
|
|
f03e82 |
DECL_TEMPLATE(linux, sys_sched_setscheduler);
|
|
|
f03e82 |
DECL_TEMPLATE(linux, sys_sched_getscheduler);
|
|
|
f03e82 |
DECL_TEMPLATE(linux, sys_sched_yield);
|
|
|
f03e82 |
diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
|
|
|
f03e82 |
index 28d90135a..d6f3eb910 100644
|
|
|
f03e82 |
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
|
|
|
f03e82 |
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
|
|
|
f03e82 |
@@ -846,9 +846,8 @@ static SyscallTableEntry syscall_table[] = {
|
|
|
f03e82 |
LINX_(__NR_process_vm_writev, sys_process_vm_writev),// 311
|
|
|
f03e82 |
LINX_(__NR_kcmp, sys_kcmp), // 312
|
|
|
f03e82 |
LINX_(__NR_finit_module, sys_finit_module), // 313
|
|
|
f03e82 |
-// LIN__(__NR_sched_setattr, sys_ni_syscall), // 314
|
|
|
f03e82 |
-
|
|
|
f03e82 |
-// LIN__(__NR_sched_getattr, sys_ni_syscall), // 315
|
|
|
f03e82 |
+ LINX_(__NR_sched_setattr, sys_sched_setattr), // 314
|
|
|
f03e82 |
+ LINXY(__NR_sched_getattr, sys_sched_getattr), // 315
|
|
|
f03e82 |
LINX_(__NR_renameat2, sys_renameat2), // 316
|
|
|
f03e82 |
// LIN__(__NR_seccomp, sys_ni_syscall), // 317
|
|
|
f03e82 |
LINXY(__NR_getrandom, sys_getrandom), // 318
|
|
|
f03e82 |
diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c
|
|
|
f03e82 |
index 579542785..70700e53f 100644
|
|
|
f03e82 |
--- a/coregrind/m_syswrap/syswrap-arm-linux.c
|
|
|
f03e82 |
+++ b/coregrind/m_syswrap/syswrap-arm-linux.c
|
|
|
f03e82 |
@@ -1009,6 +1009,8 @@ static SyscallTableEntry syscall_main_table[] = {
|
|
|
f03e82 |
LINXY(__NR_process_vm_readv, sys_process_vm_readv), // 376
|
|
|
f03e82 |
LINX_(__NR_process_vm_writev, sys_process_vm_writev),// 377
|
|
|
f03e82 |
|
|
|
f03e82 |
+ LINX_(__NR_sched_setattr, sys_sched_setattr), // 380
|
|
|
f03e82 |
+ LINXY(__NR_sched_getattr, sys_sched_getattr), // 381
|
|
|
f03e82 |
LINX_(__NR_renameat2, sys_renameat2), // 382
|
|
|
f03e82 |
|
|
|
f03e82 |
LINXY(__NR_getrandom, sys_getrandom), // 384
|
|
|
f03e82 |
diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c
|
|
|
f03e82 |
index 81e01456f..acca02442 100644
|
|
|
f03e82 |
--- a/coregrind/m_syswrap/syswrap-arm64-linux.c
|
|
|
f03e82 |
+++ b/coregrind/m_syswrap/syswrap-arm64-linux.c
|
|
|
f03e82 |
@@ -806,8 +806,8 @@ static SyscallTableEntry syscall_main_table[] = {
|
|
|
f03e82 |
LINX_(__NR_process_vm_writev, sys_process_vm_writev), // 271
|
|
|
f03e82 |
LINX_(__NR_kcmp, sys_kcmp), // 272
|
|
|
f03e82 |
LINX_(__NR_finit_module, sys_finit_module), // 273
|
|
|
f03e82 |
- // (__NR_sched_setattr, sys_ni_syscall), // 274
|
|
|
f03e82 |
- // (__NR_sched_getattr, sys_ni_syscall), // 275
|
|
|
f03e82 |
+ LINX_(__NR_sched_setattr, sys_sched_setattr), // 274
|
|
|
f03e82 |
+ LINXY(__NR_sched_getattr, sys_sched_getattr), // 275
|
|
|
f03e82 |
LINX_(__NR_renameat2, sys_renameat2), // 276
|
|
|
f03e82 |
// (__NR_seccomp, sys_ni_syscall), // 277
|
|
|
f03e82 |
LINXY(__NR_getrandom, sys_getrandom), // 278
|
|
|
f03e82 |
diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
|
|
|
f03e82 |
index 5b5b7eee6..56be3032d 100644
|
|
|
f03e82 |
--- a/coregrind/m_syswrap/syswrap-linux.c
|
|
|
f03e82 |
+++ b/coregrind/m_syswrap/syswrap-linux.c
|
|
|
f03e82 |
@@ -3677,6 +3677,41 @@ POST(sys_sched_getparam)
|
|
|
f03e82 |
POST_MEM_WRITE( ARG2, sizeof(struct vki_sched_param) );
|
|
|
f03e82 |
}
|
|
|
f03e82 |
|
|
|
f03e82 |
+PRE(sys_sched_setattr)
|
|
|
f03e82 |
+{
|
|
|
f03e82 |
+ struct vki_sched_attr *attr;
|
|
|
f03e82 |
+ PRINT("sched_setattr ( %ld, %#" FMT_REGWORD "x, %#"
|
|
|
f03e82 |
+ FMT_REGWORD "x )", SARG1, ARG2, ARG3 );
|
|
|
f03e82 |
+ PRE_REG_READ3(long, "sched_setattr",
|
|
|
f03e82 |
+ vki_pid_t, pid, struct sched_attr *, p, unsigned int, flags);
|
|
|
f03e82 |
+ /* We need to be able to read at least the size field. */
|
|
|
f03e82 |
+ PRE_MEM_READ( "sched_setattr(attr->size)", ARG2, sizeof(vki_uint32_t) );
|
|
|
f03e82 |
+ attr = (struct vki_sched_attr *)(Addr)ARG2;
|
|
|
f03e82 |
+ if (ML_(safe_to_deref)(attr,sizeof(vki_uint32_t)))
|
|
|
f03e82 |
+ PRE_MEM_READ( "sched_setattr(attr)", (Addr)attr, attr->size);
|
|
|
f03e82 |
+}
|
|
|
f03e82 |
+
|
|
|
f03e82 |
+PRE(sys_sched_getattr)
|
|
|
f03e82 |
+{
|
|
|
f03e82 |
+ struct vki_sched_attr *attr;
|
|
|
f03e82 |
+ PRINT("sched_getattr ( %ld, %#" FMT_REGWORD "x, %ld, %#"
|
|
|
f03e82 |
+ FMT_REGWORD "x )", SARG1, ARG2, ARG3, ARG4 );
|
|
|
f03e82 |
+ PRE_REG_READ4(long, "sched_getattr",
|
|
|
f03e82 |
+ vki_pid_t, pid, struct sched_attr *, p,
|
|
|
f03e82 |
+ unsigned int, size, unsigned int, flags);
|
|
|
f03e82 |
+ /* We need to be able to read at least the size field. */
|
|
|
f03e82 |
+ PRE_MEM_READ( "sched_setattr(attr->size)", ARG2, sizeof(vki_uint32_t) );
|
|
|
f03e82 |
+ /* And the kernel needs to be able to write to the whole struct size. */
|
|
|
f03e82 |
+ attr = (struct vki_sched_attr *)(Addr)ARG2;
|
|
|
f03e82 |
+ if (ML_(safe_to_deref)(attr,sizeof(vki_uint32_t)))
|
|
|
f03e82 |
+ PRE_MEM_WRITE( "sched_setattr(attr)", (Addr)attr, attr->size);
|
|
|
f03e82 |
+}
|
|
|
f03e82 |
+POST(sys_sched_getattr)
|
|
|
f03e82 |
+{
|
|
|
f03e82 |
+ struct vki_sched_attr *attr = (struct vki_sched_attr *)(Addr)ARG2;
|
|
|
f03e82 |
+ POST_MEM_WRITE( (Addr)attr, attr->size );
|
|
|
f03e82 |
+}
|
|
|
f03e82 |
+
|
|
|
f03e82 |
PRE(sys_sched_getscheduler)
|
|
|
f03e82 |
{
|
|
|
f03e82 |
PRINT("sys_sched_getscheduler ( %ld )", SARG1);
|
|
|
f03e82 |
diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c
|
|
|
f03e82 |
index eed12a1bc..c19cb9e0e 100644
|
|
|
f03e82 |
--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c
|
|
|
f03e82 |
+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c
|
|
|
f03e82 |
@@ -1016,6 +1016,9 @@ static SyscallTableEntry syscall_table[] = {
|
|
|
f03e82 |
LINXY(__NR_process_vm_readv, sys_process_vm_readv), // 351
|
|
|
f03e82 |
LINX_(__NR_process_vm_writev, sys_process_vm_writev),// 352
|
|
|
f03e82 |
|
|
|
f03e82 |
+ LINX_(__NR_sched_setattr, sys_sched_setattr), // 355
|
|
|
f03e82 |
+ LINXY(__NR_sched_getattr, sys_sched_getattr), // 356
|
|
|
f03e82 |
+
|
|
|
f03e82 |
LINXY(__NR_getrandom, sys_getrandom), // 359
|
|
|
f03e82 |
LINXY(__NR_memfd_create, sys_memfd_create), // 360
|
|
|
f03e82 |
|
|
|
f03e82 |
diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c
|
|
|
f03e82 |
index d58200b49..b6422a765 100644
|
|
|
f03e82 |
--- a/coregrind/m_syswrap/syswrap-ppc64-linux.c
|
|
|
f03e82 |
+++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c
|
|
|
f03e82 |
@@ -998,6 +998,8 @@ static SyscallTableEntry syscall_table[] = {
|
|
|
f03e82 |
LINXY(__NR_process_vm_readv, sys_process_vm_readv), // 351
|
|
|
f03e82 |
LINX_(__NR_process_vm_writev, sys_process_vm_writev),// 352
|
|
|
f03e82 |
|
|
|
f03e82 |
+ LINX_(__NR_sched_setattr, sys_sched_setattr), // 355
|
|
|
f03e82 |
+ LINXY(__NR_sched_getattr, sys_sched_getattr), // 356
|
|
|
f03e82 |
LINX_(__NR_renameat2, sys_renameat2), // 357
|
|
|
f03e82 |
|
|
|
f03e82 |
LINXY(__NR_getrandom, sys_getrandom), // 359
|
|
|
f03e82 |
diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c
|
|
|
f03e82 |
index a0a330aa2..3427fee16 100644
|
|
|
f03e82 |
--- a/coregrind/m_syswrap/syswrap-s390x-linux.c
|
|
|
f03e82 |
+++ b/coregrind/m_syswrap/syswrap-s390x-linux.c
|
|
|
f03e82 |
@@ -825,8 +825,8 @@ static SyscallTableEntry syscall_table[] = {
|
|
|
f03e82 |
LINX_(__NR_kcmp, sys_kcmp), // 343
|
|
|
f03e82 |
// ?????(__NR_finit_module, ), // 344
|
|
|
f03e82 |
|
|
|
f03e82 |
-// ?????(__NR_sched_setattr, ), // 345
|
|
|
f03e82 |
-// ?????(__NR_sched_getattr, ), // 346
|
|
|
f03e82 |
+ LINX_(__NR_sched_setattr, sys_sched_setattr), // 345
|
|
|
f03e82 |
+ LINXY(__NR_sched_getattr, sys_sched_getattr), // 346
|
|
|
f03e82 |
LINX_(__NR_renameat2, sys_renameat2), // 347
|
|
|
f03e82 |
// ?????(__NR_seccomp, ), // 348
|
|
|
f03e82 |
LINXY(__NR_getrandom, sys_getrandom), // 349
|
|
|
f03e82 |
diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
|
|
|
f03e82 |
index 332ed0bf2..b59d96f37 100644
|
|
|
f03e82 |
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
|
|
|
f03e82 |
+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
|
|
|
f03e82 |
@@ -1580,8 +1580,8 @@ static SyscallTableEntry syscall_table[] = {
|
|
|
f03e82 |
LINX_(__NR_kcmp, sys_kcmp), // 349
|
|
|
f03e82 |
|
|
|
f03e82 |
// LIN__(__NR_finit_module, sys_ni_syscall), // 350
|
|
|
f03e82 |
-// LIN__(__NR_sched_setattr, sys_ni_syscall), // 351
|
|
|
f03e82 |
-// LIN__(__NR_sched_getattr, sys_ni_syscall), // 352
|
|
|
f03e82 |
+ LINX_(__NR_sched_setattr, sys_sched_setattr), // 351
|
|
|
f03e82 |
+ LINXY(__NR_sched_getattr, sys_sched_getattr), // 352
|
|
|
f03e82 |
LINX_(__NR_renameat2, sys_renameat2), // 353
|
|
|
f03e82 |
// LIN__(__NR_seccomp, sys_ni_syscall), // 354
|
|
|
f03e82 |
|
|
|
f03e82 |
diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h
|
|
|
f03e82 |
index 75b583165..ef93b9258 100644
|
|
|
f03e82 |
--- a/include/vki/vki-linux.h
|
|
|
f03e82 |
+++ b/include/vki/vki-linux.h
|
|
|
f03e82 |
@@ -410,6 +410,23 @@ struct vki_sched_param {
|
|
|
f03e82 |
int sched_priority;
|
|
|
f03e82 |
};
|
|
|
f03e82 |
|
|
|
f03e82 |
+struct vki_sched_attr {
|
|
|
f03e82 |
+ vki_uint32_t size;
|
|
|
f03e82 |
+ vki_uint32_t sched_policy;
|
|
|
f03e82 |
+ vki_uint64_t sched_flags;
|
|
|
f03e82 |
+
|
|
|
f03e82 |
+ /* SCHED_NORMAL, SCHED_BATCH */
|
|
|
f03e82 |
+ vki_int32_t sched_nice;
|
|
|
f03e82 |
+
|
|
|
f03e82 |
+ /* SCHED_FIFO, SCHED_RR */
|
|
|
f03e82 |
+ vki_uint32_t sched_priority;
|
|
|
f03e82 |
+
|
|
|
f03e82 |
+ /* SCHED_DEADLINE */
|
|
|
f03e82 |
+ vki_uint64_t sched_runtime;
|
|
|
f03e82 |
+ vki_uint64_t sched_deadline;
|
|
|
f03e82 |
+ vki_uint64_t sched_period;
|
|
|
f03e82 |
+};
|
|
|
f03e82 |
+
|
|
|
f03e82 |
#define VKI_TASK_COMM_LEN 16
|
|
|
f03e82 |
|
|
|
f03e82 |
//----------------------------------------------------------------------
|