Kyle Roarty has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/46243 )
Change subject: arch-x86,sim: Implement sched_getaffinity
......................................................................
arch-x86,sim: Implement sched_getaffinity
sched_getaffinity is different from other syscalls in the raw syscall
return the size of the cpumask being used to represent the CPU bit mask.
Because of this, when a library (libnuma in this case) directly called
sched_getaffinity and got a return value of 0, it errored out, thinking
that there were no CPUs available.
This implementation assumes that all CPUs are available, so it sets
all simulated CPUs in the bitmask
Change-Id: Id95c919986cc98a411877056256604f57a29f0f9
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46243
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Matt Sinclair <mattdsincl...@gmail.com>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
---
M src/arch/x86/linux/syscall_tbl64.cc
M src/sim/syscall_emul.hh
2 files changed, 24 insertions(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Matt Sinclair: Looks good to me, but someone else must approve
kokoro: Regressions pass
diff --git a/src/arch/x86/linux/syscall_tbl64.cc
b/src/arch/x86/linux/syscall_tbl64.cc
index 94837cd..7231595 100644
--- a/src/arch/x86/linux/syscall_tbl64.cc
+++ b/src/arch/x86/linux/syscall_tbl64.cc
@@ -244,7 +244,7 @@
{ 201, "time", timeFunc<X86Linux64> },
{ 202, "futex", futexFunc<X86Linux64> },
{ 203, "sched_setaffinity", ignoreFunc },
- { 204, "sched_getaffinity", ignoreFunc },
+ { 204, "sched_getaffinity", schedGetaffinityFunc<X86Linux64> },
{ 205, "set_thread_area" },
{ 206, "io_setup" },
{ 207, "io_destroy" },
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index cd2d8d1..3c1ad04 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -57,6 +57,7 @@
/// application on the host machine.
#if defined(__linux__)
+#include <sched.h>
#include <sys/eventfd.h>
#include <sys/statfs.h>
@@ -2603,4 +2604,26 @@
#endif
}
+/// Target sched_getaffinity
+template <class OS>
+SyscallReturn
+schedGetaffinityFunc(SyscallDesc *desc, ThreadContext *tc,
+ pid_t pid, size_t cpusetsize, VPtr<> cpu_set_mask)
+{
+#if defined(__linux__)
+ if (cpusetsize < CPU_ALLOC_SIZE(tc->getSystemPtr()->threads.size()))
+ return -EINVAL;
+
+ BufferArg maskBuf(cpu_set_mask, cpusetsize);
+ maskBuf.copyIn(tc->getVirtProxy());
+ for (int i = 0; i < tc->getSystemPtr()->threads.size(); i++) {
+ CPU_SET(i, (cpu_set_t *)maskBuf.bufferPtr());
+ }
+ maskBuf.copyOut(tc->getVirtProxy());
+ return CPU_ALLOC_SIZE(tc->getSystemPtr()->threads.size());
+#else
+ warnUnsupportedOS("sched_getaffinity");
+ return -1;
+#endif
+}
#endif // __SIM_SYSCALL_EMUL_HH__
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/46243
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Id95c919986cc98a411877056256604f57a29f0f9
Gerrit-Change-Number: 46243
Gerrit-PatchSet: 5
Gerrit-Owner: Kyle Roarty <kyleroarty1...@gmail.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Kyle Roarty <kyleroarty1...@gmail.com>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
