From patchwork Mon Oct 1 17:58:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10622561 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F7F715A7 for ; Mon, 1 Oct 2018 18:21:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41AB628174 for ; Mon, 1 Oct 2018 18:21:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 359942843C; Mon, 1 Oct 2018 18:21:30 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 7AF8528174 for ; Mon, 1 Oct 2018 18:21:28 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=FhL7HCwAlG1SYOtDUybCb1Wh7+rEK8xPLWGK/HTBESs=; b=MVZjiNT6HochWh pvJeY3dDBRfwT2bTSljz66AXETb5EvDcgu5T2KCnt8jQ5SfGYy1IgygVSZ4Nzhdjgtu9ADABIAv8i XEehDGTW5VooAibuOjyd0MDzwYvM9Ltrp8bMeEvq9KLjaIcRnbd7Y1zwABj/rXYpj78xumh6a3fmW UUXpr5+YeJ8WGXpI7aTfrPq54VXvZH1jyZKSHTKjD5n46/ppKehnQJLnMkF5s6kq/8WGnS65Am/dG JD/5VUmUulqU7AOiR2n3yCTpiIn/lG31qnYJYaoyLEmFV+FIwj+zeX45/C4rKOJhNCWnWOGNh4hRg 4P36bzBTKI+AUXoORCNA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72ok-0002kE-Jl; Mon, 01 Oct 2018 18:21:14 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72jt-0007UJ-CY for linux-arm-kernel@bombadil.infradead.org; Mon, 01 Oct 2018 18:16:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jl8w66ZtkNhdtips3F7dVSeZ+uWCx+HUDA6gL1nWgkw=; b=HxLDX6VLwaFyhRUMvf8vuuY7LS XUPDt/qPw0VWEa6eo8HTWa6yJBf1aiC4x9lHbJQeJ9DTCdnp2l88m7nBS9O0YxTh8JT9bwB41AypC we25qVGeLdtsfKM/D7IYfNqwk6wMyFf7CJ5zsJjBOoaNgJl6G0JPpW/+ENflbKL1UzZSvnymnUcZn wgrWpHwoTwtXqxyCxpVhCyuBs0Xp0qF/2SgsCx9g6YRs4tbz0H+66t1QssqunfBf+KNTtfvBNFkz4 5UoydLlSqNgOzGGl9V1nM56hWSvDU1osOgq3122KbuL9rwclNH2SouUYRhs+FQ3+ICaK2amqkEtB1 jVq7ZzKQ==; Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72VZ-0005uR-J4 for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2018 18:01:27 +0000 Received: by mail-pg1-x544.google.com with SMTP id a5-v6so1443917pgv.13 for ; Mon, 01 Oct 2018 11:01:15 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=jl8w66ZtkNhdtips3F7dVSeZ+uWCx+HUDA6gL1nWgkw=; b=ZdMmVsOjMl0Mci3QDghHncrw69hbwShEz1oz7N5JX6u3/qtbzHg1vzAwugBp239Btu bhWQnaQUUQvD9pG02/zICNMGB49Us5yYc1qZYn7Q1GTL879z8NznUuO38EGrhkPsS20H 4e5nPfgln5RWwxqD7EF9I9P9B4SnSsHxDIwSqW4maujJn7wFG2SWqnP/y3Eymsw7Zy29 4VdrD6TRFnjfR3q9Y4NRhabszohjWfhja8zBb95ys9P/GPdlKKdpw3VHKZhv3aamiabN 9y2RFlXvrzwSpERxEGhSiXenNVMU/OugEwyWB/W2sVUsopKrv9vMOhAoIhhgm5EBmriM vOTQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=jl8w66ZtkNhdtips3F7dVSeZ+uWCx+HUDA6gL1nWgkw=; b=tI4grec6IpZlyjWYRU65mVAokFh4RyNLfxlygstEceE1LzP1yKE7UmqBf8y9T9qxet JrsvUbaFM58dSlSwoUauBeIExYB45+eGgEp7t25fUMvfpcxom+pfqqevAI/WBKfR3zMh mIv/u1h+4Z96DVZiP2qd9OxE/nBrA06VpVsxi1h5jLGh5sDgC2ecJY3ivpcsE2VPVVH6 vJ/Z6T3txuLRi+vFom5TDrC9D6nJSEW5UttwoFjLLCbQoRbgtwkK7jBiVyCC5pD9rNot uKo0rcqPvjk+5un6QbvQ3u8WXogejI/unO+9EvmV5nDlxyjUDpiVLW3EoOF6zlXa7OLT P8/g== X-Gm-Message-State: ABuFfoicCxTBFj2I1+gJ0JnJ2g5ZEXoFmkUlE3xu7vtOySftxovhGze2 R/x9UXHIrp2PRzzr57oDLZNBSw== X-Google-Smtp-Source: ACcGV61iwPwDR6ZP0gShH7leGkat+WLLsOD2olYo0JlUPLtUpSHofa3vvN0fGEvOt1pZFEa0FxlPQQ== X-Received: by 2002:a17:902:7c85:: with SMTP id y5-v6mr9826718pll.200.1538416873771; Mon, 01 Oct 2018 11:01:13 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([2620:0:1000:1612:b4fb:6752:f21f:3502]) by smtp.gmail.com with ESMTPSA id d186-v6sm24469261pfg.173.2018.10.01.11.01.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 11:01:13 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: RESEND [PATCH v5 06/12] arm: vdso: add support for clock_getres Date: Mon, 1 Oct 2018 10:58:26 -0700 Message-Id: <20181001175845.168430-7-salyzyn@android.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog In-Reply-To: <20181001175845.168430-1-salyzyn@android.com> References: <20181001175845.168430-1-salyzyn@android.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181001_190125_641105_E43A753B X-CRM114-Status: GOOD ( 22.83 ) 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 , Catalin Marinas , Will Deacon , Mark Salyzyn , Ingo Molnar , Russell King , Andy Gross , Laura Abbott , Mark Salyzyn , Kees Cook , Kevin Brodsky , Jinbum Park , John Stultz , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Paul E. McKenney" , Ard Biesheuvel , Dmitry Safonov , android-kernel@android.com, Jeremy Linton , Andy Lutomirski , James Morse , Andrew Pinski 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 Take an effort to recode the arm64 vdso code from assembler to C previously submitted by Andrew Pinski , rework it for use in both arm and arm64, overlapping any optimizations for each architecture. But instead of landing it in arm64, land the result into lib/vdso and unify both implementations to simplify future maintenance. Add clock_getres vdso support to match up with existing support in the arm64's vdso. Signed-off-by: Mark Salyzyn Tested-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: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Jeremy Linton Cc: android-kernel@android.com v2: - split first CL into 7 of 7 pieces v4: - update commit message to reflect overall reasoning. - replace typeof() with long for nsec - replace clock_id with clock to match usage elsewhere. v5: - add linux/hrtimer.h to compiler.h to supply for LOW_RES_NSEC and MONOTONIC_RES_NSEC. --- arch/arm/kernel/vdso.c | 1 + arch/arm/vdso/compiler.h | 1 + arch/arm/vdso/vdso.lds.S | 1 + arch/arm/vdso/vgettimeofday.c | 23 +++++++++++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index 9c13a32fa5f0..c299967df63c 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -191,6 +191,7 @@ static void __init patch_vdso(void *ehdr) if (!cntvct_ok) { vdso_nullpatch_one(&einfo, "__vdso_gettimeofday"); vdso_nullpatch_one(&einfo, "__vdso_clock_gettime"); + vdso_nullpatch_one(&einfo, "__vdso_clock_getres"); } } diff --git a/arch/arm/vdso/compiler.h b/arch/arm/vdso/compiler.h index 3edddb705a1b..c7751019246a 100644 --- a/arch/arm/vdso/compiler.h +++ b/arch/arm/vdso/compiler.h @@ -27,6 +27,7 @@ #include /* for cpu_relax() */ #include #include +#include /* for LOW_RES_NSEC and MONOTONIC_RES_NSEC */ #include /* for NSEC_PER_SEC */ #ifndef CONFIG_AEABI diff --git a/arch/arm/vdso/vdso.lds.S b/arch/arm/vdso/vdso.lds.S index 89ca89f12d23..1d81e8c3acf6 100644 --- a/arch/arm/vdso/vdso.lds.S +++ b/arch/arm/vdso/vdso.lds.S @@ -82,6 +82,7 @@ VERSION global: __vdso_clock_gettime; __vdso_gettimeofday; + __vdso_clock_getres; local: *; }; } diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index a2c4db83edc4..a354586f8a65 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -32,6 +32,7 @@ DEFINE_FALLBACK(gettimeofday, struct timeval *, tv, struct timezone *, tz) DEFINE_FALLBACK(clock_gettime, clockid_t, clock, struct timespec *, ts) +DEFINE_FALLBACK(clock_getres, clockid_t, clock, struct timespec *, ts) static notrace u32 vdso_read_begin(const struct vdso_data *vd) { @@ -301,3 +302,25 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) return 0; } + +int __vdso_clock_getres(clockid_t clock, struct timespec *res) +{ + long nsec; + + if (clock == CLOCK_REALTIME || + clock == CLOCK_MONOTONIC || + clock == CLOCK_MONOTONIC_RAW) + nsec = MONOTONIC_RES_NSEC; + else if (clock == CLOCK_REALTIME_COARSE || + clock == CLOCK_MONOTONIC_COARSE) + nsec = LOW_RES_NSEC; + else + return clock_getres_fallback(clock, res); + + if (likely(res != NULL)) { + res->tv_sec = 0; + res->tv_nsec = nsec; + } + + return 0; +}