From patchwork Thu Oct 12 22:59:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10003195 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 367E9602BF for ; Thu, 12 Oct 2017 23:06:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25E4128C13 for ; Thu, 12 Oct 2017 23:06:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1ACF328CFD; Thu, 12 Oct 2017 23:06:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6A63C28C13 for ; Thu, 12 Oct 2017 23:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=iC71DMr+MTxph52U66MGJKdyyQNCRPxSRtqE8mwITUo=; b=awP hkWIc8S7etAwAkEhCiIS/oQ2hWHFIHbz+KY2bYj9/+WF7cDuhc4taXSLeEEETgUuqhsz6S1H0cKCY r0NOQIOvUoyc59aySluntEvlUqn6rNfvhSJW8zymlUzv4mhRT25VbM23TiJO0efxH2I5RwGlJHcpZ jd3hNoQ5jbECjaa2iT/i5AtPhGl38JqKjNB82GEbc9D2ynz72QoKva37ufpJF7iN0sn9AFhccANmJ keRzvgCmjUNzvw3Qk4oYRhhS+DgLdroIZVTJUVXSD0Y7VOvr1x5MmKARTB/j7cAJNgjHNrlA3RsuN GJy49jxxuK8rlv6SVxo0greZJZogj+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e2mYr-000362-71; Thu, 12 Oct 2017 23:06:41 +0000 Received: from mail-pf0-x231.google.com ([2607:f8b0:400e:c00::231]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e2mSW-0003j0-7w for linux-arm-kernel@lists.infradead.org; Thu, 12 Oct 2017 23:00:21 +0000 Received: by mail-pf0-x231.google.com with SMTP id n14so7029640pfh.8 for ; Thu, 12 Oct 2017 15:59:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=nTTRyKJUsmEPyzo4V/qeOFr1Xw7OVAHeZfW42BKvjy8=; b=nhhPeAcpS8u7s5yjJ5kvQ5i1MdnBqzqFKyc4D4K3v5Q2yfr1azD1pupvXv8i8foc54 bZbMt74HlmufG8TFAJEM38LjnUso3AEXCCeSTs+DsGdlMNwP5ANEwnTsSal/2r9qevnS wghANeh1EdSg2q+IPcIPyr2Fd1ouXe083zJKF5PmwjWr3lXlfofO1N+YxREqaEjE3Oxt N2F+eZMo7RqJ0qBrgXAvXDU5KikPOV4VDmSZR4cjDu1IhiQX8dqh77zRP9PFRH5PV/zt btvLSRe7B0BL6c95W1R5PlhQwlUan9Nhwm8ataGgnwDeqJgnXfH5ZklEud1jVL7Ki3LS lvzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=nTTRyKJUsmEPyzo4V/qeOFr1Xw7OVAHeZfW42BKvjy8=; b=nIGKzMWVY51eWUTCQV3mv/EsV03Fvca3aH5QpkTecZPY24gG3GCfhpPfYVAidzBYE7 d4FhZnmdvEztg+eIXjnJIHgMaiDCfo4A6MY8TM+7rgwM2yaqXEgoJSEq4w0fdG+TmNsp wJSd78nUA/2lDlNE8+OHC0kUsW7xT6jYkCx94edbsBwsAP6/T9kH0FkbjTNq+pWCmiy2 4kvCyksrEITrLRGjWm0GkDCuxJPOonFIrMfv0mslaBLejh3HUNdGmXsGTIQhKVTrA5FP PBQfI9TDVwSkKS+lq2m6Dbx5g0XKePmG+8p5wSsn7go505yu3SlBr5Lj0m8iGBAAF1Sg jg+A== X-Gm-Message-State: AMCzsaUO/Po+RyGktO+aisC2KA5H72vwlVufyJFhdNkWgBpIbrr9eTE7 wqxhfRYX2PBuQB7got6/R5ZZsA== X-Google-Smtp-Source: AOwi7QAlRPRkIk+2k/5eagV9YLi1varKhfRx0CfabpZ40ETjMeBLJv7ifk0BiYZ9v6t0dfnjefVbiA== X-Received: by 10.99.154.66 with SMTP id e2mr1396710pgo.116.1507849187280; Thu, 12 Oct 2017 15:59:47 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id x87sm23206333pfi.10.2017.10.12.15.59.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 15:59:46 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v2 3/10] arm: vdso: inline assembler operations to compiler.h Date: Thu, 12 Oct 2017 15:59:32 -0700 Message-Id: <20171012225940.86652-1-salyzyn@android.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171012_160008_502908_F3D64FDC X-CRM114-Status: GOOD ( 20.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, james.morse@arm.com, Russell King , Mark Salyzyn , Mark Salyzyn MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move compiler-specific code to a local compiler.h file. CONFIG_AEABI dependency check. System call fallback functions standardized into a DEFINE_FALLBACK macro. Accept that __arch_counter_get_cntvct() is the API for aarch64. Deal with unresolved references emitted by GCC. Optimize handling of fallback calls. Most notably add unlikely nullptr checking to __vdso_gettimeofday, if tv null no need to proceed to fallback, as vdso is capable of filling in the tv values. For time functions that always return success, do not waste time checking return value for switch to fallback. Signed-off-by: Mark Salyzyn v2: split first CL into 3 of 7 pieces --- arch/arm/vdso/compiler.h | 69 ++++++++++++++++++++++++++ arch/arm/vdso/vgettimeofday.c | 109 +++++++++++------------------------------- 2 files changed, 96 insertions(+), 82 deletions(-) create mode 100644 arch/arm/vdso/compiler.h diff --git a/arch/arm/vdso/compiler.h b/arch/arm/vdso/compiler.h new file mode 100644 index 000000000000..ef1d664fb4fa --- /dev/null +++ b/arch/arm/vdso/compiler.h @@ -0,0 +1,69 @@ +/* + * Userspace implementations of fallback calls + * + * Copyright (C) 2017 Cavium, Inc. + * Copyright (C) 2012 ARM Limited + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Author: Will Deacon + * Rewriten into C by: Andrew Pinski + */ + +#ifndef __VDSO_COMPILER_H +#define __VDSO_COMPILER_H + +#include +#include +#include +#include + +#ifndef CONFIG_AEABI +#error This code depends on AEABI system call conventions +#endif + +#define DEFINE_FALLBACK(name, type_arg1, name_arg1, type_arg2, name_arg2) \ +static notrace long name##_fallback(type_arg1 _##name_arg1, \ + type_arg2 _##name_arg2) \ +{ \ + register type_arg1 name_arg1 asm("r0") = _##name_arg1; \ + register type_arg2 name_arg2 asm("r1") = _##name_arg2; \ + register long ret asm ("r0"); \ + register long nr asm("r7") = __NR_##name; \ + \ + asm volatile( \ + " swi #0\n" \ + : "=r" (ret) \ + : "r" (name_arg1), "r" (name_arg2), "r" (nr) \ + : "memory"); \ + \ + return ret; \ +} + +#define __arch_counter_get_cntvct() arch_counter_get_cntvct() + +/* Avoid unresolved references emitted by GCC */ + +void __aeabi_unwind_cpp_pr0(void) +{ +} + +void __aeabi_unwind_cpp_pr1(void) +{ +} + +void __aeabi_unwind_cpp_pr2(void) +{ +} + +#endif /* __VDSO_COMPILER_H */ diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index 2474c17dc356..5f596911bd53 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -22,21 +22,16 @@ * Reworked and rebased over arm version by: Mark Salyzyn */ -#include -#include -#include -#include #include -#include -#include -#include - -#ifndef CONFIG_AEABI -#error This code depends on AEABI system call conventions -#endif +#include +#include +#include "compiler.h" #include "datapage.h" +DEFINE_FALLBACK(gettimeofday, struct timeval *, tv, struct timezone *, tz) +DEFINE_FALLBACK(clock_gettime, clockid_t, clock, struct timespec *, ts) + static notrace u32 vdso_read_begin(const struct vdso_data *vd) { u32 seq; @@ -63,23 +58,6 @@ static notrace int vdso_read_retry(const struct vdso_data *vd, u32 start) return seq != start; } -static notrace long clock_gettime_fallback(clockid_t _clkid, - struct timespec *_ts) -{ - register struct timespec *ts asm("r1") = _ts; - register clockid_t clkid asm("r0") = _clkid; - register long ret asm ("r0"); - register long nr asm("r7") = __NR_clock_gettime; - - asm volatile( - " swi #0\n" - : "=r" (ret) - : "r" (clkid), "r" (ts), "r" (nr) - : "memory"); - - return ret; -} - static notrace int do_realtime_coarse(const struct vdso_data *vd, struct timespec *ts) { @@ -127,7 +105,7 @@ static notrace u64 get_ns(const struct vdso_data *vd) u64 cycle_now; u64 nsec; - cycle_now = arch_counter_get_cntvct(); + cycle_now = __arch_counter_get_cntvct(); cycle_delta = (cycle_now - vd->cs_cycle_last) & vd->cs_mask; @@ -200,85 +178,52 @@ static notrace int do_monotonic(const struct vdso_data *vd, struct timespec *ts) #endif /* CONFIG_ARM_ARCH_TIMER */ -notrace int __vdso_clock_gettime(clockid_t clkid, struct timespec *ts) +notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) { - int ret = -1; - const struct vdso_data *vd = __get_datapage(); - switch (clkid) { + switch (clock) { case CLOCK_REALTIME_COARSE: - ret = do_realtime_coarse(vd, ts); + do_realtime_coarse(vd, ts); break; case CLOCK_MONOTONIC_COARSE: - ret = do_monotonic_coarse(vd, ts); + do_monotonic_coarse(vd, ts); break; case CLOCK_REALTIME: - ret = do_realtime(vd, ts); + if (do_realtime(vd, ts)) + goto fallback; break; case CLOCK_MONOTONIC: - ret = do_monotonic(vd, ts); + if (do_monotonic(vd, ts)) + goto fallback; break; default: - break; + goto fallback; } - if (ret) - ret = clock_gettime_fallback(clkid, ts); - - return ret; -} - -static notrace long gettimeofday_fallback(struct timeval *_tv, - struct timezone *_tz) -{ - register struct timezone *tz asm("r1") = _tz; - register struct timeval *tv asm("r0") = _tv; - register long ret asm ("r0"); - register long nr asm("r7") = __NR_gettimeofday; - - asm volatile( - " swi #0\n" - : "=r" (ret) - : "r" (tv), "r" (tz), "r" (nr) - : "memory"); - - return ret; + return 0; +fallback: + return clock_gettime_fallback(clock, ts); } notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) { - struct timespec ts; - int ret; - const struct vdso_data *vd = __get_datapage(); - ret = do_realtime(vd, &ts); - if (ret) - return gettimeofday_fallback(tv, tz); + if (likely(tv != NULL)) { + struct timespec ts; + + if (do_realtime(vd, &ts)) + return gettimeofday_fallback(tv, tz); - if (tv) { tv->tv_sec = ts.tv_sec; tv->tv_usec = ts.tv_nsec / 1000; } - if (tz) { + + if (unlikely(tz != NULL)) { tz->tz_minuteswest = vd->tz_minuteswest; tz->tz_dsttime = vd->tz_dsttime; } - return ret; -} - -/* Avoid unresolved references emitted by GCC */ - -void __aeabi_unwind_cpp_pr0(void) -{ -} - -void __aeabi_unwind_cpp_pr1(void) -{ -} - -void __aeabi_unwind_cpp_pr2(void) -{ + return 0; }