From patchwork Thu Oct 12 23:00:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10003217 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 AF85A6028A for ; Thu, 12 Oct 2017 23:18:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FF2F28D43 for ; Thu, 12 Oct 2017 23:18:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 948B428DE2; Thu, 12 Oct 2017 23:18:04 +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 301A628D43 for ; Thu, 12 Oct 2017 23:18:03 +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=oavFy719ZsGlMiwz98jGmpMy2vKZZXHL9PzoCqh5b4o=; b=r4i OShXzdoCvR93s17/j1TXneNtkVZUnksxMj9ioNxD0nkpZzdp6rOz9CxjGWLbWP3WVXBNYjC1yhK7J bE/dHcvaP8qgPw3DA6ebaiuXjNVsRdZzpl9e+1HA2ARdNHoj0qfqvZc2BqJ4itJhlzRq/vYJQN8uq FemOT+dGr6gBhL6gYtwqjIuN41vYeX/aD/xLjwww/6wibZH/uxnoFiPJfgSeGH2uL5vAXcD91eIrb S0ZQJgI2atOH1A7EM8/TmDYeMztTdLBwuffq1c6fxVbhSJLCOIgbAHytu8RWDJ23lxfr033ZnFnQi I5Q/AN3f/nxZ+//W0CzLFOYomz1VERg==; 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 1e2mjR-00039Y-KN; Thu, 12 Oct 2017 23:17:37 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e2mjP-0002w7-U5 for linux-arm-kernel@bombadil.infradead.org; Thu, 12 Oct 2017 23:17:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=nAHZfMjhEBfv8fxn+GJ3iAOrbkKjkqwrUM/bTLvy1+s=; b=ezpoYsysD2Ih80K5dFLyX0lyp 2/B+YssWsaNWCzVHV0ucoV8Jo6a/rxtSX9yXsftb9cDQp7xxR2ADJpGye8erPM7W47mq7QZwvSVAO azrskq2m9mG6dkw33MdqyVHzTCvlCtWXo6q/2GqXgQ486BIWEUbOTmTwiGqZyqTFMoh7Y4iKQ75Iu V6u+mGb+H2aCXTj4Rlncch1PTYm0/YzVu/V1PuPvLHjptyZqrhgrGyA4rNtD/qZAb9BfrXINlvVO3 XT73AfvNSoVF9N9G9sMy4sL1CaurTnZG3vx+1g3HcuHlx0GcUzPflH2tLysq2Gb2CEKCoXdr8Aqc3 /qNocEeJQ==; Received: from mail-pf0-x230.google.com ([2607:f8b0:400e:c00::230]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e2mTe-0001Wj-1y for linux-arm-kernel@lists.infradead.org; Thu, 12 Oct 2017 23:01:20 +0000 Received: by mail-pf0-x230.google.com with SMTP id 17so7024868pfn.12 for ; Thu, 12 Oct 2017 16:00:57 -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=nAHZfMjhEBfv8fxn+GJ3iAOrbkKjkqwrUM/bTLvy1+s=; b=HaZOLqFc6ueDHiz3db8X35shFuyaRmdplOv1vTYRJOEcCyKLpUH3b5uxCqbeppWq2R IGVCSwKffY6TBk4HmQiRwZXmiVH0fS/64rAATtZ9bvEt4hI28uTQN/tdcZ0nf6nPzXEq WLHtzdpauyYkUasZ+Pz6JyVHn4JvHn/WIE1R/or7YnUFWw1e03sBNVjgrd4NN/sw7tag ywKQopou5QMkG3Sx4df2wNEyWJnVlLHZjC60Z5rO+0z4rNrZeVUbTsk5vAoJgnlQviMS k3anamk34FbC9a2xBedxBQZPIJp9m0VU2QEmgEaqDvyn/vQHWLbXkXAnk6Su/ELDtjR1 YPlQ== 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=nAHZfMjhEBfv8fxn+GJ3iAOrbkKjkqwrUM/bTLvy1+s=; b=cxBSgORuP0ukkXhZSfnNb9Nv5PVPb19zVXH+3FU+GHgUqZyeq3G14WAg7uffh4GXws +SHvM7XGHYxv13trmp7z0n5eKQrkmJ+20CzB7mAcRZQ2igenf94KLmEAVTk+2RB33Rbg cptAIFK4HubT4Xp6qEZUnQH1iikSNIPmzEUNLP1HgwSsyAMzfJLOGY0iB0rQ/Jt+8/SP PuHtKzFVRugH4+UjYKn65wIkJ08CiIo8UrkZ9MQa1SrfzXwxM0lm6j8N/qnzocf2I2uw hZ8cifEEaL22JoLhuxa/6nzpYoIkFwi3lPsQZRlli4L50kQEbsRt9wZn7qrZ3KFzMAwa ozVg== X-Gm-Message-State: AMCzsaWPtYqp05l6dUD3XFZ4j+xo8aPXRzfBwdvsx/XlNsAGJ2znpFlg 4IC1fS0ZhD5A3OL5JjbC0lBg+A== X-Google-Smtp-Source: AOwi7QB5/oyio4WzqfVrJE+2m3HDedn4tudiefWbVidPS2KAf3E2GJXbnihWnka/sDNJNrWtYQHnfw== X-Received: by 10.99.96.141 with SMTP id u135mr1421203pgb.316.1507849251131; Thu, 12 Oct 2017 16:00:51 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id d12sm31324812pfl.140.2017.10.12.16.00.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 16:00:50 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v2 7/10] arm: vdso: add support for clock_getres Date: Thu, 12 Oct 2017 16:00:40 -0700 Message-Id: <20171012230046.86938-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-20171013_000118_304584_8E0FD311 X-CRM114-Status: GOOD ( 13.82 ) 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: Dmitry Safonov , Russell King , Andy Lutomirski , james.morse@arm.com, linux-arm-kernel@lists.infradead.org, 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 Add clock_getres vdso support to match up with existing support in the arcm64's vdso. Signed-off-by: Mark Salyzyn v2: split first CL into 7 of 7 pieces --- 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; +}