From patchwork Fri Oct 27 22:25:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10030725 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 0EFAB6032C for ; Fri, 27 Oct 2017 22:26:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC80D28FE7 for ; Fri, 27 Oct 2017 22:26:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D15A728FEB; Fri, 27 Oct 2017 22:26:47 +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 86C5528FE7 for ; Fri, 27 Oct 2017 22:26:47 +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=WLI2RkhuHMTPwwHF/HopvvVWwhzLNGEqwSBAvvjVaFY=; b=YX9 SQrv3/C1rsMq16HP3nEZ8yAI4kECNjmUi3ZqC9fnIqR/r0xTEVvvf1oEOuBwCXZ3mPXK2maZF25XJ ItpCtqAHrmBl5kBO9PHikCjgsEB9HMcO329ymfqr2B/IkH2t9rJRa1/mS8oQvquwe8bnymwtlRgMq gcysqVO525CsTfYy3Dt4RmZr+fG0FoCocy45Jhlr9Nw7ZFZZD/E0H/ZQ33Tdl2IX/ocY1L+4LjoK3 hD0VTAxdUgj07OXe3VCgfgwXboq9DaY8xpG6E25Ku3Q/Cq8QbrpZjS/ji8W4nxlnBjGO/5cXRAOZI gx7ib2sfg7fnSFvDIKPCdaXe02r9/iQ==; 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 1e8D5P-0003EC-8c; Fri, 27 Oct 2017 22:26:43 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e8D4m-0002uy-V4 for linux-arm-kernel@bombadil.infradead.org; Fri, 27 Oct 2017 22:26:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=EbYWiT+QBe4jtkbkJZjCt//+tlRAaeWOeCPXHLn272Y=; b=MoL6NSZX1KjcfUDXi7Ns8diFO tpUZa5s4k9nIeHYUCa+3cQddBZ/vPceJZ+cF7l6dovmZGgmTnl/9PNa8le/YeKTIFvFR2A1Yfc8qj kABGhP/aBkKsS4THwvkhiBrKl5cyBSy3d5a3pGvffrShE1JuVALw8cDWc9yS0+0Geoi4i9+BEsf8g tr3V9SrLSWv7M8EnnZI9Z7lPM21SEW2zm9wEjusOzvnBHM1l6kTZQeRhZQBtXXF+MWn9ukW3YNdFv jemU+J7kdOXcQ8/JFm64eww67t790oF81hPVYGMKyj/P5tU7+X7j/3jyDdVPUrFOCxuJzOzgdMk8o tc9Zy6QkA==; Received: from mail-io0-x244.google.com ([2607:f8b0:4001:c06::244]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e8D4j-0000L3-Qw for linux-arm-kernel@lists.infradead.org; Fri, 27 Oct 2017 22:26:03 +0000 Received: by mail-io0-x244.google.com with SMTP id e89so15708483ioi.11 for ; Fri, 27 Oct 2017 15:25:38 -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=EbYWiT+QBe4jtkbkJZjCt//+tlRAaeWOeCPXHLn272Y=; b=PKjNhCXXN7YP0I5hkj5ao39m+oV2PKUkAmF7d63fXvmg4qRj4fOWFM5Q4alPklhDsn rzZu2p9a15586d/RuUOJZ9L+Kl2X0MDQpwqHpGZRkV3rOQ92MKxxN4dMdu6ACs/ZplAA EkEC+xakaeYi5S/2FUGoJEhQrVjmAO6oWpSDUYi1SrrgKQvJEW132nQnX54dmVAwMw/6 wIMkpeEItgxawcWD3356jxlp2766hWO33zaVD773NGe4etPwmVwp3N1EWUJ6+9T4OGmV ksk8AIfavcQXCM3roE52kGF/xjRy9NDvuEgVzsnRJacgBtOQ3/rF4PIgbTCJyJ0bevUA QkzA== 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=EbYWiT+QBe4jtkbkJZjCt//+tlRAaeWOeCPXHLn272Y=; b=HGXHgp3eYhARHLvhz6legx0qFKJCKaS6nOiZcJnbS5vAo09zAsdPvEJwhpU81yrwpq bvMnhwb5l3DDx7YR0Ytj66xy8fm79tvIrS2NylUJx2LLsB617paxvpnh+yiXgdraI4+j /wfSpJqWKBNonQhd532SSJLa3L+JM356tM6b6bIBWxYI/I2MapdplTwf1nwKm8dgu4sy saaLdApYqR6/mneD59dfHU2DaPQexcjO090NMxfwkVUrV3bQqnEjxiA0Xf/cTsF68mfL R2AG8N0tBDrdAOUNW5B09vfQqzkPhDdVHLc+puLCldeYGHKqymen6l5w4HWFVFFlCxei dDGg== X-Gm-Message-State: AMCzsaUbxMkDn5zO8PfZ1bwEc2KJ3WIMDkJI3CgCBEqjF3JyrJST81jT kIXUltHibzTrqUkLnu5F/KGNHA== X-Google-Smtp-Source: ABhQp+SzskokutAwQqS9TFMbe87GALFt2CCKwoYTahOqBdYjGMFMynwIxHAoRt2txTT7NAaptu0gxw== X-Received: by 10.107.169.199 with SMTP id f68mr2415267ioj.162.1509143136170; Fri, 27 Oct 2017 15:25:36 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id y73sm1361747itc.8.2017.10.27.15.25.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Oct 2017 15:25:35 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v3 04/12] arm: vdso: enforce monotonic and realtime as inline Date: Fri, 27 Oct 2017 15:25:28 -0700 Message-Id: <20171027222531.57223-1-salyzyn@android.com> X-Mailer: git-send-email 2.15.0.rc2.357.g7e34df9404-goog 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: Mark Rutland , Laura Abbott , Kees Cook , Ard Biesheuvel , Catalin Marinas , Kevin Brodsky , Will Deacon , Russell King , Andy Lutomirski , Mark Salyzyn , James Morse , Andrew Pinski , Dmitry Safonov , Andy Gross , John Stultz , Mark Salyzyn , linux-arm-kernel@lists.infradead.org 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 Ensure monotonic and realtime are inline, small price to pay for high volume common request. Signed-off-by: Mark Salyzyn Cc: James Morse Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Cc: Andy Lutomirski Cc: Dmitry Safonov Cc: John Stultz Cc: Mark Rutland Cc: Laura Abbott Cc: Kees Cook Cc: Ard Biesheuvel Cc: Andy Gross Cc: Kevin Brodsky Cc: Andrew Pinski Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org v2: - split first CL into 4 of 7 pieces v3: - rebase (unchanged) --- arch/arm/vdso/vgettimeofday.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index 5f596911bd53..71003a1997c4 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -99,7 +99,7 @@ static notrace int do_monotonic_coarse(const struct vdso_data *vd, #ifdef CONFIG_ARM_ARCH_TIMER -static notrace u64 get_ns(const struct vdso_data *vd) +static __always_inline notrace u64 get_ns(const struct vdso_data *vd) { u64 cycle_delta; u64 cycle_now; @@ -115,7 +115,9 @@ static notrace u64 get_ns(const struct vdso_data *vd) return nsec; } -static notrace int do_realtime(const struct vdso_data *vd, struct timespec *ts) +/* Code size doesn't matter (vdso is 4k/16k/64k anyway) and this is faster. */ +static __always_inline notrace int do_realtime(const struct vdso_data *vd, + struct timespec *ts) { u64 nsecs; u32 seq; @@ -137,7 +139,8 @@ static notrace int do_realtime(const struct vdso_data *vd, struct timespec *ts) return 0; } -static notrace int do_monotonic(const struct vdso_data *vd, struct timespec *ts) +static __always_inline notrace int do_monotonic(const struct vdso_data *vd, + struct timespec *ts) { struct timespec tomono; u64 nsecs;