From patchwork Tue Dec 3 13:56:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1203723 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-107646-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="BqBHeFEJ"; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="CTxakB1o"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47S3S04TYdz9sPV for ; Wed, 4 Dec 2019 00:56:32 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=JeyGagk8CYHq7H3/BJUy7CEYpMVK7ZT niap5pQi/YmDEiGH9QppCzsW7/k/0HKXHf4DfZ4mORje1jIK6JOlhpRnmY+Gjd+1 fCmjaG3PCAQ4Vtc6k528w8IYxooRvN3NnhuxhzPqHddH0Hao6c09DyjR9Co8YVmH xnnz+yy5I5iY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=3madO1D5sjL59ikVeJEK7mBAQ9I=; b=BqBHe FEJX9c2Z5crjxJ5Z/M1LExg5b1kyo/f8NG7D/8vLqUwJG5HKgW/dycSJHb+UD8YX qdV+Md9p3iCee2C7UTDeBReBtlMVqSVzLq3At5C66GBHSvPhFbRZe6sE8+qgZVXy 3yYOIshQ0CaSJfyJgoFhT8VRTiUo0b3vg0ZBmw= Received: (qmail 89031 invoked by alias); 3 Dec 2019 13:56:26 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 89023 invoked by uid 89); 3 Dec 2019 13:56:25 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qt1-f193.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=yc2RiJamrELdafoTIEmvI9ERyr+fj0GafsrCSUUAYyE=; b=CTxakB1oJLBOcCye3F2knqXNBgc7hwlCsiAcziAccp8DO1D30Mn5lwIgpSmxtEVCs9 BpJnXHOujhpIE1JOfuFmTfrG0lGP5rC22Eh5dvfZz4473Zhi90YPrj/E0UI+ASLdbRZu 5f0PDa3bvn++VDt0N8GloVUlNpIo/ot2EZ6H0ekws2JRtVuiiioWRKGXzGGAbzTSCknv H+slwXEtxRsvE2yDgv7Vp6Nt+BD+lQoa7W6dI0EeuI+F6JnHugFARzTbcZOOCJiCvpHY iPHvZA+6TdA8E2hiTpy0E08JllmrWtLx34otyz0lDlk2IwRG3dCndHRHMggYuEw14OWX tbqw== From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2] linux: Add inline getcpu implementation for sched_getcpu and getcpu Date: Tue, 3 Dec 2019 10:56:17 -0300 Message-Id: <20191203135617.14709-1-adhemerval.zanella@linaro.org> In-Reply-To: <22ce01a8-9f61-4588-bb50-1d3aa4a302e1@linaro.org> References: <22ce01a8-9f61-4588-bb50-1d3aa4a302e1@linaro.org> Changes from previous version: - Add getcpu_priv.h with a common implementation for both sched_getcpu and getcpu. Checked on x86_64-linux-gnu. --- sysdeps/unix/sysv/linux/getcpu.c | 16 ++--------- sysdeps/unix/sysv/linux/getcpu_priv.h | 38 ++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/sched_getcpu.c | 17 ++---------- 3 files changed, 42 insertions(+), 29 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/getcpu_priv.h diff --git a/sysdeps/unix/sysv/linux/getcpu.c b/sysdeps/unix/sysv/linux/getcpu.c index fdd27203af..0ce49bb027 100644 --- a/sysdeps/unix/sysv/linux/getcpu.c +++ b/sysdeps/unix/sysv/linux/getcpu.c @@ -15,24 +15,12 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include - -#ifdef HAVE_GETCPU_VSYSCALL -# define HAVE_VSYSCALL -#endif -#include +#include int __getcpu (unsigned int *cpu, unsigned int *node) { -#ifdef __NR_getcpu - return INLINE_VSYSCALL (getcpu, 3, cpu, node, NULL); -#else - __set_errno (ENOSYS); - return -1; -#endif + return getcpu_priv (cpu, node); } weak_alias (__getcpu, getcpu) libc_hidden_def (__getcpu) diff --git a/sysdeps/unix/sysv/linux/getcpu_priv.h b/sysdeps/unix/sysv/linux/getcpu_priv.h new file mode 100644 index 0000000000..a347dde56e --- /dev/null +++ b/sysdeps/unix/sysv/linux/getcpu_priv.h @@ -0,0 +1,38 @@ +/* Determine CPU and NUMA node on which the calling thread is running. + Linux private implementation. + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _GETCPU_PRIV_H +#define _GETCPY_PRIV_H + +#include +#include +#include + +#ifdef HAVE_GETCPU_VSYSCALL +# define HAVE_VSYSCALL +#endif +#include + +static inline int +getcpu_priv (unsigned int *cpu, unsigned int *node) +{ + return INLINE_VSYSCALL (getcpu, 3, cpu, node, NULL); +} + +#endif diff --git a/sysdeps/unix/sysv/linux/sched_getcpu.c b/sysdeps/unix/sysv/linux/sched_getcpu.c index 65dd9fdda7..463e5e86bc 100644 --- a/sysdeps/unix/sysv/linux/sched_getcpu.c +++ b/sysdeps/unix/sysv/linux/sched_getcpu.c @@ -15,25 +15,12 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include - -#ifdef HAVE_GETCPU_VSYSCALL -# define HAVE_VSYSCALL -#endif -#include +#include int sched_getcpu (void) { -#ifdef __NR_getcpu unsigned int cpu; - int r = INLINE_VSYSCALL (getcpu, 3, &cpu, NULL, NULL); - + int r = getcpu_priv (&cpu, NULL); return r == -1 ? r : cpu; -#else - __set_errno (ENOSYS); - return -1; -#endif }