From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/9427 Path: news.gmane.org!not-for-mail From: Nathan Zadoks Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] add sched_getcpu, with vDSO support Date: Tue, 1 Mar 2016 16:56:06 +0100 Message-ID: <1456847766-23953-1-git-send-email-nathan@nathan7.eu> References: <1456839940-10330-1-git-send-email-nathan@nathan7.eu> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1456847797 9830 80.91.229.3 (1 Mar 2016 15:56:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 1 Mar 2016 15:56:37 +0000 (UTC) Cc: Nathan Zadoks To: musl@lists.openwall.com Original-X-From: musl-return-9440-gllmg-musl=m.gmane.org@lists.openwall.com Tue Mar 01 16:56:29 2016 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1aamey-0005G9-L1 for gllmg-musl@m.gmane.org; Tue, 01 Mar 2016 16:56:28 +0100 Original-Received: (qmail 18025 invoked by uid 550); 1 Mar 2016 15:56:25 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 17972 invoked from network); 1 Mar 2016 15:56:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nathan7.eu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SS3ZvEgIt03wL5FApK0HvrLkCwqIZ3bZyljsB94nwtY=; b=O6IgoArmHXZuKqPfObXG7oUVhvb8eZcIdsPEkA+vbKLPlf7byPxNw+u4pLFI0DlVlu O6sh3ugWhsAYLkU20ONM4Sogk1BO1D33feYJ93a8sBCE46Q35ZeKZHOM70Hn/DwU647s TcsCd70E+ROY3S+pJQHs277fYQRPYul4+EYZ0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SS3ZvEgIt03wL5FApK0HvrLkCwqIZ3bZyljsB94nwtY=; b=jGsD/uK6qHXp5C+cfqamNSDt/21aENnIJIsKGM3h6bGv8XPNKXlW+nIJ5tVzZP9qXh QKC0npMjtqJMhRiuAudpFoZleOd8XN/rUFlF+DDI37G2euHa/kVJ/AT4gXwMWd+hlqEq D5fbVmVw6EhdeAI24UzhwGTfEXgKV1OxXKsWyfyVk9SSdT44qg0KyZppTohrabsO8RpW ExPKKGBjpFyWTDd+7lmKT3mAbmK46ZeROLTZJua0nvdseNPbP8zqPGZrpMPyrtRBaTO0 YXrWRNT3I1cO/69RMLpThj9oOSkB7ViTu8a2laCoWGT0TfWAca1tkxwwxxyZyMwqpxpy /v1Q== X-Gm-Message-State: AD7BkJJh88iYOo4tOOfCCTYXgdBrlkNMFrVn2GhtBS3IjcS1G98Afnc+6rcF9PYz6Oj7cg== X-Received: by 10.28.224.84 with SMTP id x81mr4873525wmg.62.1456847770229; Tue, 01 Mar 2016 07:56:10 -0800 (PST) X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456839940-10330-1-git-send-email-nathan@nathan7.eu> Xref: news.gmane.org gmane.linux.lib.musl.general:9427 Archived-At: This is a GNU extension, but a fairly minor one, for a system call that otherwise has no libc wrapper. Adding it was discussed previously, without any objections: http://www.openwall.com/lists/musl/2015/05/08/24 --- Whoops, forgot to make getcpu_init a static function in the previous version. Fixed! --- arch/x86_64/syscall_arch.h | 2 ++ include/sched.h | 1 + src/sched/sched_getcpu.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 src/sched/sched_getcpu.c diff --git a/arch/x86_64/syscall_arch.h b/arch/x86_64/syscall_arch.h index a7a7b5a..54e05ff 100644 --- a/arch/x86_64/syscall_arch.h +++ b/arch/x86_64/syscall_arch.h @@ -64,3 +64,5 @@ static __inline long __syscall6(long n, long a1, long a2, long a3, long a4, long #define VDSO_USEFUL #define VDSO_CGT_SYM "__vdso_clock_gettime" #define VDSO_CGT_VER "LINUX_2.6" +#define VDSO_GETCPU_SYM "__vdso_getcpu" +#define VDSO_GETCPU_VER "LINUX_2.6" diff --git a/include/sched.h b/include/sched.h index 3e34a72..7e88f09 100644 --- a/include/sched.h +++ b/include/sched.h @@ -76,6 +76,7 @@ void free(void *); typedef struct cpu_set_t { unsigned long __bits[128/sizeof(long)]; } cpu_set_t; int __sched_cpucount(size_t, const cpu_set_t *); +int sched_getcpu(void); int sched_getaffinity(pid_t, size_t, cpu_set_t *); int sched_setaffinity(pid_t, size_t, const cpu_set_t *); diff --git a/src/sched/sched_getcpu.c b/src/sched/sched_getcpu.c new file mode 100644 index 0000000..096f06f --- /dev/null +++ b/src/sched/sched_getcpu.c @@ -0,0 +1,45 @@ +#define _GNU_SOURCE +#include +#include +#include +#include "syscall.h" +#include "atomic.h" + +#ifdef VDSO_GETCPU_SYM + +void *__vdsosym(const char *, const char *); + +static void *volatile vdso_func; + +typedef long (*getcpu_f)(unsigned *, unsigned *, void *); + +static long getcpu_init(unsigned *cpu, unsigned *node, void *unused) +{ + void *p = __vdsosym(VDSO_GETCPU_VER, VDSO_GETCPU_SYM); + getcpu_f f = (getcpu_f)p; + a_cas_p(&vdso_func, (void *)getcpu_init, p); + return f ? f(cpu, node, unused) : -ENOSYS; +} + +static void *volatile vdso_func = (void *)getcpu_init; + +#endif + +int sched_getcpu(void) +{ + int r; + unsigned cpu; + +#ifdef VDSO_CGT_SYM + getcpu_f f = (getcpu_f)vdso_func; + if (f) { + r = f(&cpu, NULL, NULL); + if (!r) return cpu; + if (r != -ENOSYS) return __syscall_ret(r); + } +#endif + + r = __syscall(SYS_getcpu, &cpu, NULL, NULL); + if (!r) return cpu; + return __syscall_ret(r); +} -- 2.7.1