From patchwork Tue Oct 31 18:31:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10035231 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 6B807602B5 for ; Tue, 31 Oct 2017 19:04:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C58225404 for ; Tue, 31 Oct 2017 19:04:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E93F28AE8; Tue, 31 Oct 2017 19:04:31 +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 7010F28ADF for ; Tue, 31 Oct 2017 19:04:30 +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=iJB+pQIposo0rJjuExmc+dOhgGjvwxzAdZ8gPosMxkw=; b=YuF WueMMu5t9d0HGl6659zDEKiY14Ki6sYMg/3e6lz56ta22ED6PA1g1JF7pIf93KCMhuKOvH9U5ljlP 1F2S2XNPNuNEjd9jfRu43OVRnEdoBYO4ZiJBHjM3F6PhbLz2ApElasfCl3rO2KVmUZTiW8r+Xm+Ah bBcSeOBz1m8CuBBptQCnbiqkpFAyq1P5ObpqEkM52h8IdsB/JUSe2pOf5zwt0DFUXPBPB5RM1lBDa 0VNXj4OMtFc6iqSkUn8OqdoRHn3ILN4ypEuU63lFBVXYzW4Xn4RD/FctfkqDieBGULCezM39nhmWE T4G0CdW03jvrIFmaTl+e/gjaZwgD+vw==; 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 1e9bpX-0000AR-Gi; Tue, 31 Oct 2017 19:04:07 +0000 Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e9bKh-0006A0-MT for linux-arm-kernel@lists.infradead.org; Tue, 31 Oct 2017 18:32:43 +0000 Received: by mail-io0-x241.google.com with SMTP id b186so836849iof.8 for ; Tue, 31 Oct 2017 11:31:58 -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=/27af7jgEecbX5RwDyIcTDSPcVlfypd/PmBb8wr+p4w=; b=iJPKIycaultB5kpRLwCfHAZhuvJvbXM0CPC2YAiMMRkFguQoaOqk9g2a3/6NJGhAH1 XKB+fd2pBctMwf7P8KVcHv5tSAV0e6uRhcCbe6k2qVrAgfdaiAnxlMMBUilxfIVeUMff iB6OrmCdDiyzMfIcnrRP/nsy6B9xJpVe9r1+0J86HHzMm34mopBopKQl+gRytPdcyhcH j8I0bP/OHxrvQ4eKv2yWMDveaJ+rW5BgPng2Zi2bcOUi2pWjykRfGlsV9nf/DsQjL3+Y xnCZgXmfFPXk7cfHSaEsSlo0mvmRzHbuwDbjNwhvIIZ8mN7/k5AWr5g6/gTrmKktbOxP PbfA== 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=/27af7jgEecbX5RwDyIcTDSPcVlfypd/PmBb8wr+p4w=; b=sSe6XAEqMpyByWgpuksbKxOcwzSY0tRIM00MP7zcxnEtCK1hYly/19H6parRFwTcAN rHAAQsxINqU9M44KwPVeeZKAPEb8wIyHOuSmA1kYxM3wzI1WpEZTWAFM/fPFgcSMPIAy QH0E+E3wsHdoeiC1Vdadvy6oTPkVawPzoqVojEmaD5toWux86u4SwGgY1MBBlEfAFuTc 5AOYnsGKBtQoAD14fweAMZu6Wu92xrzvkizINaa8lSoqj7sY+3vnxaVZ9xQZd4VZE3Nm GIjqjhhsCF09cJ7rsE3o2KVuQuN90WViEJxqSghQ8GjFj11cweNT7fdoER6HHx5YaK6U PfSQ== X-Gm-Message-State: AMCzsaVv/iBqgQAHQ3hP6fOaEXQs6wZFsLShUco2KXI+GugYRWVh2A+m ZZCXaChTAGzoZ7LsMXHNfVqnVg== X-Google-Smtp-Source: ABhQp+QURoVB8uYB/VZZPdicraQaDgb8DIm1FDTsEiliQ6DJJeylUkLOFWOKKKkWIRINMZRSJaqz/g== X-Received: by 10.107.78.6 with SMTP id c6mr3720651iob.68.1509474718278; Tue, 31 Oct 2017 11:31:58 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id j41sm944919ioi.80.2017.10.31.11.31.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Oct 2017 11:31:57 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v4 06/12] arm: vdso: add support for clock_getres Date: Tue, 31 Oct 2017 11:31:49 -0700 Message-Id: <20171031183154.81127-1-salyzyn@android.com> X-Mailer: git-send-email 2.15.0.rc2.357.g7e34df9404-goog X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171031_113216_488353_B2B556AB X-CRM114-Status: GOOD ( 15.49 ) 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 , James Morse , Andrew Pinski , Dmitry Safonov , Andy Gross , John Stultz , Thomas Gleixner , 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 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 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 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. --- 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 2b9fce92904e..1152308067e1 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) { @@ -296,3 +297,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; +}