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 X-Patchwork-Id: 180725 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1531914ile; Tue, 3 Dec 2019 05:56:34 -0800 (PST) X-Google-Smtp-Source: APXvYqxtbXqP6oMNVZpTjewaL6RBI5W6E05wwpptqn8meoaTNC4VE8mAeUS3BVBNLrSSK/otrFwW X-Received: by 2002:a9d:4543:: with SMTP id p3mr3248797oti.350.1575381394820; Tue, 03 Dec 2019 05:56:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575381394; cv=none; d=google.com; s=arc-20160816; b=fSw9C8293GpNVNZYlTqPLPqKCl1jSd65XBT+/wHhEWrkRO+74k81neKKTU6HT66j2H hH9aW/xhEHTiHiQzy2PWFwTHWRzSpt2L6vRSO+78I8VqMmODRDPhNpA3XoAV7KD7BF3b VwTa4YAveaS6ANADQYtorq/pO+cwa00d1OTLEE0xiV8RSfR2nXkJmKmQI4H/82F8zd1z LZ9fPugvkKWK5zMFoeRuWuhY9PVc6V6191V54XrBasN5Dah+g2f2X1bY8UKbmFMf8J7h mIsC16hsi8aCtrVrQl6yJ4MNjAU047vr0a4WHyV6x1y3Odh3UY+lfHgjQdiruhVPH7io ITog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=yc2RiJamrELdafoTIEmvI9ERyr+fj0GafsrCSUUAYyE=; b=S5sdzYp2sju2dM/ERjQ9Q7De5VoG0f5MdY058WBAcVX9PZca3ULMOX+m84gJGjzhv7 i9c2Hpo1EF9RnGf+RYtgYGQU6cn7+RCbLKosge/9KdpL0qcufNKNbfzb+HTX40YZHWxq C2/ZMoKi2s5ctQqkaACeQZg80xDn1R3bz1rump/+9AqK24VTbvdnlH3diHj6vPlx+8TH VZ7avRKujG6lYBPk2WnZgquWZyCxoJc7BTS7uw3A33uk32ExFoX2iYGtZq/yCmNDtzUp mSqG26kAL9du5UpQ0Qu3NnRKnGNp+M7Dim1xf7fcp0GxqgF8sIAjBGujK05KQFptBVeX 7G7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=fbJKmMTE; dkim=pass header.i=@linaro.org header.s=google header.b=CTxakB1o; spf=pass (google.com: domain of libc-alpha-return-107646-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107646-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id n5si1130922otr.35.2019.12.03.05.56.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Dec 2019 05:56:34 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107646-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=fbJKmMTE; dkim=pass header.i=@linaro.org header.s=google header.b=CTxakB1o; spf=pass (google.com: domain of libc-alpha-return-107646-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107646-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=YWm8FTRZxoF5ZYZz98cHEV43p1JDqkB GNV9f4zPYs10C5PZDoEkvObnZNauSYj1sdyL2MUL6ZzYARSBu5Rq1XYjbu4ti1Ul Q10TS7Zb7gtKZCp3kYUJaytqxWsFTOALcu79MBek6N/aWwaK47eh+V1xG6ztQ2GH UOXGoOeZPHTU= 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=fbJKm MTEWAB3+QldlVj/avnGgEbINpMJeGZ3kLwFxGGBHz31uSBBAVLMu8ql9PV5p8/Lf Ije7CymWgtwsZs1x4ujvzdoC6wGthHE71zrksdoLAQ+PV4qQWEV73qYofrKGF8jg lo4ibqvA2Qy8cRGwwzBDp2EhRjUYtDjX6XUifY= 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== Return-Path: 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 -- 2.17.1 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 }