From patchwork Fri Oct 27 22:26:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10030739 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 697146032C for ; Fri, 27 Oct 2017 22:28:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 465A328FE7 for ; Fri, 27 Oct 2017 22:28:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 398D528FEE; Fri, 27 Oct 2017 22:28:34 +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 B8B8328FEB for ; Fri, 27 Oct 2017 22:28:33 +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=/Z2ebbA3MLawOew+zdfHAy/wTopzzrG7hMnjAxUGCD8=; b=K9O h15YFtAdTlD88rQWC2+hO0lR8QJV5jY7uFNi7gXF3IX4MWSAgJONvHxkr1OFlilWfx5K3u0Bswj99 +bZrjNafGxByuvy2U/dpAvhQwINgWlsEef2YFRoOz5KYa65L3np2qlPcV5yWBPUWU0/7piiJNEFML lbsdvyBut5LLreunfjuHeOufHwi/aieV36To7NeNU6TlqqGbtyCiaGeWhxknTnePtlseZn9XoohW4 o++Qnutm/43WSllAevRxPUWermTEnZqrY5KXe0IqONcVsDDpLFk/Ka3Gu0ca3YdwpmjF0Qrdc7l6F GBqQ1MdPOFZeRYIBGiZE+t0kF+Oje+Q==; 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 1e8D7B-00042B-EX; Fri, 27 Oct 2017 22:28:33 +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 1e8D5T-0003GZ-UJ for linux-arm-kernel@bombadil.infradead.org; Fri, 27 Oct 2017 22:26:48 +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=F+OcEEENdyD7hyiowMC2o4+++XAk+WNPSme+K3Vf/0M=; b=riKAxLTXZ3IvKUjxEwwloerPP 9giOz+iVJYeQiaMpVdCSVgrpE3wLcUCzWPhYmOB4V2J/xbcgeMJM5ztscrNlJLkIuxiHUdC9vSp19 8zeov4CUvqjJZhSqAyoLeca8tfgazRSeGHjnpsc0Ohc6DYn9kWJyYhvXKvnJooxLXjTyH/5URj2wr RCVOMlC7XwUU3h82FeA3xuCwI3BSJghpyFGVGvKXF+Ds1+EHMVsV7CqQ6Nm2+LtSyHhQQf3y9OODt hirrILXFdrY3lGj2H4JUuOjpnVkvpkokXEN3eQwDdF2CzAX76TzKR2dEBncLgOaZxAkUsyl3vmsO9 ToUtVA/pA==; Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e8D5Q-0000Lg-Ff for linux-arm-kernel@lists.infradead.org; Fri, 27 Oct 2017 22:26:46 +0000 Received: by mail-io0-x241.google.com with SMTP id n137so15765888iod.6 for ; Fri, 27 Oct 2017 15:26:24 -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=F+OcEEENdyD7hyiowMC2o4+++XAk+WNPSme+K3Vf/0M=; b=n+aB3M/gvySS+yXkUVFOndyGOrxEawsweD+zVT07g6jefQR21UyCX7A+4Kf8G5ihEd btGAQ+ygvNsOP3BFB1SUs48LBejpQTQN7BC4uJTDO38GlHAzvZmyOwxE4B/1kTXRBnFg KjT8BDhZaR8BRfT0yhmMKM/CeTaLBF56nUI5uPZCE6ALFjSTelUgZ+kA13s55w8zMSxr xpy+oyuntQBGfZH6vY5WBKtpLwg0RWjViJduCIHyh0fy2PEFExRQS9v9PZ2X0MsQQ8+W ddQt0xhA7M6lx//kvMUBNQqcNnK/YfJAPGkoT85k2gq3nsnggdAvE6BnEKQja4U8JVuP jFwg== 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=F+OcEEENdyD7hyiowMC2o4+++XAk+WNPSme+K3Vf/0M=; b=V2YAxLKuRdQ/qFN5jfq9eEYagUr++jBgTupnPENRIvQkAoOq36uZFG7IiKkICgmPwt PqClTQOqouO5yg4247nWE3fOY5vN2qbPO/Ib+fr34fEyiIpxjiTKHvW/AAuhptos4uPO pL6eXOcjUgl07MI1PQ0FnjX/JTODuZTEmhEyDOER9KWFmqs+TwVujcj7txSWx0yn09Ec ekfvNrOMyG4eNUyCxx0ERVcKBGf0yUit0dlwCjQ+1BtvLtMG2c3AKtl+2+75ovocmKBH rx1PtZoFlwXUldV+KV5tlH1ivYxNghmtETrtMVJvPTEuaHBNVHEMVBuq7NLHKuAU3lat lF6g== X-Gm-Message-State: AMCzsaX7u1n+U83fAbQ9ChDQEjHCjYJYJub9UWxFCGr2gR4RSZVcla9R rMU50MAZDFNjYxKQBxxjqBAdjw== X-Google-Smtp-Source: ABhQp+RQCV1bf5MfqpnCNipLbjCOdwtsaOoBCp2bOl9p2HUGm4M64QWNvkSbDOPoJkF+7WQWmbmiQw== X-Received: by 10.107.112.4 with SMTP id l4mr2451809ioc.261.1509143181990; Fri, 27 Oct 2017 15:26:21 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id w195sm1376411ita.44.2017.10.27.15.26.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Oct 2017 15:26:21 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v3 07/12] arm: vdso: add support for clock_getres Date: Fri, 27 Oct 2017 15:26:11 -0700 Message-Id: <20171027222616.58095-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 Add clock_getres vdso support to match up with existing support in the arcm64's vdso. 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 7 of 7 pieces v3: - rebase (unchanged) --- arch/arm/kernel/vdso.c | 1 + arch/arm/vdso/vdso.lds.S | 1 + arch/arm/vdso/vgettimeofday.c | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index 7377638a3b00..287424541f3a 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -189,6 +189,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/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 b374c143d53e..841e7fd74a1b 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -31,6 +31,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) { @@ -320,3 +321,25 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) return 0; } + +int __vdso_clock_getres(clockid_t clock_id, struct timespec *res) +{ + typeof(res->tv_nsec) nsec; + + if (clock_id == CLOCK_REALTIME || + clock_id == CLOCK_MONOTONIC || + clock_id == CLOCK_MONOTONIC_RAW) + nsec = MONOTONIC_RES_NSEC; + else if (clock_id == CLOCK_REALTIME_COARSE || + clock_id == CLOCK_MONOTONIC_COARSE) + nsec = LOW_RES_NSEC; + else + return clock_getres_fallback(clock_id, res); + + if (likely(res != NULL)) { + res->tv_sec = 0; + res->tv_nsec = nsec; + } + + return 0; +}