Skip to content

Correct syscall name SYS_get_cpu used with old glibc where getcpu() is missing. #1897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
petterreinholdtsen wants to merge 1 commit into from
Closed

Correct syscall name SYS_get_cpu used with old glibc where getcpu() is missing. #1897

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Correct syscall name SYS_get_cpu used with old glibc where getcpu() i… 
…s missing.

Handle both SYS_get_cpu and SYS_getcpu, even though I am unsure if both ever existed,
and make sure to error out if neither of them are available.

Fixes #1894.
  • Loading branch information
@petterreinholdtsen
petterreinholdtsen committed Feb 24, 2024
commit 7469011f4f4bd42c5270e919e88ac6eefc06fe67
13 changes: 11 additions & 2 deletions ggml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2084,8 +2084,17 @@ void ggml_numa_init(enum ggml_numa_strategy numa_flag) {
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 28)
getcpu_ret = getcpu(&current_cpu, &g_state.numa.current_node);
#else
// old glibc doesn't have a wrapper for this call. Fall back on direct syscall
getcpu_ret = syscall(SYS_getcpu,&current_cpu,&g_state.numa.current_node);
// old glibc doesn't have a wrapper for this call. Fall back on
// direct syscall
getcpu_ret = syscall(
# if defined(SYS_getcpu)
SYS_getcpu,
# elif defined(SYS_get_cpu)
SYS_get_cpu,
# else
# error "Unable fo find getcpu syscall define"
# endif /* SYS_getcpu */
&current_cpu,&g_state.numa.current_node);
Comment on lines +2087 to +2097
Copy link
Contributor

@cebtenzzre cebtenzzre Feb 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think something like this would be more readable:

Suggested change
// old glibc doesn't have a wrapper for this call. Fall back on
// direct syscall
getcpu_ret = syscall(
# if defined(SYS_getcpu)
SYS_getcpu,
# elif defined(SYS_get_cpu)
SYS_get_cpu,
# else
# error "Unable fo find getcpu syscall define"
# endif /* SYS_getcpu */
&current_cpu,&g_state.numa.current_node);
# if !defined(SYS_getcpu) && defined(SYS_get_cpu)
# define SYS_getcpu SYS_get_cpu
# endif
// old glibc doesn't have a wrapper for this call. Fall back on direct syscall
getcpu_ret = syscall(SYS_getcpu, &current_cpu, &g_state.numa.current_node);

Copy link
Contributor

@bmtwl bmtwl Mar 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cebtenzzre that looks like an elegant solution.
@petterreinholdtsen are you able to test cebtenzzre's proposed fix and confirm that it works in your case?

#endif

if (g_state.numa.n_nodes < 1 || g_state.numa.total_cpus < 1 || getcpu_ret != 0) {
Expand Down