From patchwork Mon Nov 6 21:02:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10044545 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 0E9FB6032D for ; Mon, 6 Nov 2017 21:51:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED6632A064 for ; Mon, 6 Nov 2017 21:51:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E23992A06B; Mon, 6 Nov 2017 21:51:01 +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 7C1422A064 for ; Mon, 6 Nov 2017 21:51:01 +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=oyzeNMxm5cTdDBaSlh+LqB4xmV0eGOt5GaZ/Wc7ksbI=; b=mMu mM6ckot1SrfSAQk2l5oTisMatSLkL8BUyhrXzsghShITCSOwEHdhWWMkIEeTGhOyThaE5bxcPJLHc 4nY0IWuTnVoi60n1nJhQDa16IMYzWAjZuD3OwM8Hjzv2t84dJ/SVrG9TIthdFlTy/tmbj+3MefSqI rSdR0KKKGT1H4AkwG1njUB8+/YV2YOLHHSnc7FxV7PNq99FsX7fmelWCSAtC5d8WUj2c7htKJWQJc UErYp5HzmYLulXxoNCcxSo84nI74z7sdodclqyJKULqo7b65jDqWetCJUfPfqovjtns7NTb9eZQLX aIq0CqOU6FOSy0D6u4Gmie8i8g4NDOQ==; 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 1eBpII-0000nF-7I; Mon, 06 Nov 2017 21:50:58 +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 1eBpGf-0007ZM-GO for linux-arm-kernel@bombadil.infradead.org; Mon, 06 Nov 2017 21:49:17 +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=1vBk0snTpzNJUbq43Kuxq8RJfMQy2GDoOXLtj6y/s0g=; b=oC6IjqIHr6506q2LkGbEforZV 6NgzDxOG8n1AopPHNwOhViVmgukdMV1i5oxDM+dVi3IYAO6HdqyuQtkFOyA6EZ/HHaWO9SlSOpUhx qMlk2DV9PCH6vGUEnZG5rldvj9znTpiNYRFe6LSsAGNivbGmHUzX8ghUJxgGNOoF1EyYFcoSH+FrU FPQShD54XX11AfDjrOaSadGVaWSfvkYFXgcQNVfce1enwa9Cq9t+VDo3H0pNKBmnT0xquo/FVat2U 8utUz5korvrC2J77bQ94B4lbbEFM7wO9d5Gl8Uce5U5ZsOH8PrK+hPXfHsYDY6AhfmwhkeLbXoWMD 6IEZWSrHg==; 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 1eBoXo-0004O2-PJ for linux-arm-kernel@lists.infradead.org; Mon, 06 Nov 2017 21:02:57 +0000 Received: by mail-io0-x244.google.com with SMTP id 189so17138120iow.10 for ; Mon, 06 Nov 2017 13:02:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=1vBk0snTpzNJUbq43Kuxq8RJfMQy2GDoOXLtj6y/s0g=; b=n3OVXRqdEQ67TJjQZwMmjeqGR6BGtF2zR9Xrgbdyr4i6tMbUcIeUz9zhGVs7Euj041 sz4WvkEmg2m1E5Z1MH3k0HlkBdd/qQOFNNpCt4WT8Sf/itKGrCJgiOPn5RXBW6qezCgE 4otiiuazxYKinLfMhoLyHKkX2X4hblIBWObLmkZeX6aeiBtK8AfAdGKV1KqGTefU99V0 yFK3Dob1jsChrD+lyXdG90Pggc/4YgWQ/G7g6eTRlDoV6EmhOiXLKAnQR8wsPotJ/6+f Lc84GxskGYDP7L7T7gvB3jULPG91Tz17KDuaPnGmqqQxs1i6PlLvC6X+fHTe3vY0UPx/ I6VQ== 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=1vBk0snTpzNJUbq43Kuxq8RJfMQy2GDoOXLtj6y/s0g=; b=IL5XcaXPjtOdwyaAv+Ninl6YPaLrV0yRNkCc3J57icnSQTuQgD41lj724QE/XBqf40 Nr+zPSvQw+AakhaXhnDp01Z/xA+pLuq88fPP067kR9ClTyLJgn9lASYqCaQLH4N4Rubm NbEEgJ/jGCoGqPpU0bY5TRec/u5NPPpXoZPON7rqSuZqUDbGuO0FYeo0mM/CZ6RZNf8L qLs/12n1SZfyx0iLqmI/Im+g0swyW4MP+NNP2knWGUZL0AxatNoLrvQMpSJ+hs/5JR+T npNCAwxhw8grIilY6ZIZwz9GSLEALDTKcjos5NRbhWp0BU1MC8IOZu/gtVmqMKP67FWj SLhQ== X-Gm-Message-State: AJaThX4OTRH3MzfX3eLZooBIT+jOkfaUBJlec87OTdSjRKrFwsW+1iMh GiHap85sNw+SbCPnYvmdKvg8gw== X-Google-Smtp-Source: ABhQp+Tr2Xk5pMEkWWPSo8CfgXrXj84Ur4PqMYKoTIXv+SQM+IBIIUJvDmtU/C0ioN9SDmXFbb4c1A== X-Received: by 10.107.200.6 with SMTP id y6mr21303066iof.123.1510002151440; Mon, 06 Nov 2017 13:02:31 -0800 (PST) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id r65sm4867080ith.1.2017.11.06.13.02.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Nov 2017 13:02:31 -0800 (PST) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v5 06/12] arm: vdso: add support for clock_getres Date: Mon, 6 Nov 2017 13:02:19 -0800 Message-Id: <20171106210227.95012-1-salyzyn@android.com> X-Mailer: git-send-email 2.15.0.403.gc27cc4dac6-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 , 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. 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 b7c93fce2f59..a80c58805699 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/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; +}