From patchwork Fri Oct 27 22:27:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10030747 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 0F7636032C for ; Fri, 27 Oct 2017 22:30:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4E7D29001 for ; Fri, 27 Oct 2017 22:30:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E336829004; Fri, 27 Oct 2017 22:30:28 +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 53AC929003 for ; Fri, 27 Oct 2017 22:30: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: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=HC9MaYMxmeFyvJioAwh5H5PH4i7skw21jGqA5wm6i8Y=; b=jgR RaXZnHMCLvXP3nvbnaryAxgu/fUYOeIXCTabKiT+Ph5wpO3tZRhNASATRH4IsnCgpwgQl1NzOFNYc jYG08LWqJn5prMnLUbUlYcuvxGNRWNiRvJAltHQIAhT3jIs0KPggExAwcJfO4S0C74fOtoy03hhmI Bh5FYENiv9UUfq70xff25hi9JDpEQ9FEcRKLyCVJZEEEZQVbOc2tNKZj4YZS5JBqE154SC6BftL+n XOQ1h1r+KI756X0Psl/+DVscubM6t43tM9fQJqvAo5ZfIDmmij6I8dlsjLj9kymD7fxCl3TVr3pw1 gb6P2ZfpFyyktSzq8sU5aeU9kr7vVeg==; 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 1e8D91-0006Od-HA; Fri, 27 Oct 2017 22:30:27 +0000 Received: from mail-io0-x242.google.com ([2607:f8b0:4001:c06::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e8D76-00040l-Gy for linux-arm-kernel@lists.infradead.org; Fri, 27 Oct 2017 22:28:31 +0000 Received: by mail-io0-x242.google.com with SMTP id f20so15735291ioj.9 for ; Fri, 27 Oct 2017 15:28:08 -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=OHtkR5QBS6x9UQ/2r75t6PA6D0rvO5qxJvqSSegGHO0=; b=taH3YhBHEm8gFF02Q5igCgV2k4bhqHLOcJUX2OFBvwM8DAL2lg4FxG8ysDXnPYfqQ5 32OQO6joqcxs+luNwbTzd2CXbFA0xmMCZYKNprg/o3vguqpUfPE/yNc9vZjfJFFKwUv7 j2ya8yPFpZT5CvckHAJAgUireZCkebz4mRwQmSRb6Onf6zbYQ0eFs+p1P8HrVQ69unyg mnzKmdlZZJ5bQU47xub1jV6tv78WuugYcvtoyPu1hg2f7yxfMpM6khYQNPkbejr7Trkl svlKBDOOkq+JVJtilDEP+qbZiggCoPtBomwrkU2x9Wc16nmCBCdjKDPa/9PtZA8qsaLl FhEg== 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=OHtkR5QBS6x9UQ/2r75t6PA6D0rvO5qxJvqSSegGHO0=; b=N19oz13iqQRcJMACCqGRKsbYDpCwU3Iu3M3NZGynrkHUbDHruw8PbnFe1rI6nub2V5 qymeG5Umm7pfW0slMiaLhKCcmtqrjIyyDv6aChysHNe4ehLuh73a8hdSL1PVeTLV/BIP VDWnyJ7AoohGdBZA2Eqof6k7m08Gjppibyl5BrfHqUtN6dRdCuHsH28y80WEwethU3B6 MNEjCeg0k+ERsz8EMx6AhxRG6yAUuje3fMsoP6y3bbC29yo8pZB9P0tojfA4H4RUIONU S94N8sCGLUMlTSb6ZSLeGsI+Y29Tj//32yGxQlkb50/WBqL2oC7kDVsqFY5KUq3je9mu gCkQ== X-Gm-Message-State: AMCzsaUAiiyonlTDuhrIUzQNxjA2o391OJoeetAbYjHQcYwv/lD7EBg1 xwgIp5loh1O/CGqvhRJMpNkojA== X-Google-Smtp-Source: ABhQp+TIPCAqSidMrigjmE4waYtzksNkoDoR5z1/1N55BEkWZHE9dOxrrDY1Yatddyr8/osKlXNp7g== X-Received: by 10.107.201.132 with SMTP id z126mr2552802iof.245.1509143287852; Fri, 27 Oct 2017 15:28:07 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id k19sm1394169itb.18.2017.10.27.15.28.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Oct 2017 15:28:07 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v3 12/12] lib: vdso: do not expose gettimeofday, if no arch supported timer Date: Fri, 27 Oct 2017 15:27:57 -0700 Message-Id: <20171027222803.58460-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-20171027_152828_701276_6BEE6DD0 X-CRM114-Status: GOOD ( 14.38 ) 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 If ARCH_PROVIDES_TIMER is not defined, do not expose gettimeofday. libc will default directly to syscall. Also ifdef clock_gettime switch cases and stubs if not supported and other unused components. 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 v3: - do not expose gettimeofday if arch does not support user space timer --- lib/vdso/vgettimeofday.c | 52 +++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/lib/vdso/vgettimeofday.c b/lib/vdso/vgettimeofday.c index 0546ff12673d..22d0873778ed 100644 --- a/lib/vdso/vgettimeofday.c +++ b/lib/vdso/vgettimeofday.c @@ -29,7 +29,9 @@ #include "compiler.h" #include "datapage.h" +#ifdef ARCH_PROVIDES_TIMER DEFINE_FALLBACK(gettimeofday, struct timeval *, tv, struct timezone *, tz) +#endif DEFINE_FALLBACK(clock_gettime, clockid_t, clock, struct timespec *, ts) DEFINE_FALLBACK(clock_getres, clockid_t, clock, struct timespec *, ts) @@ -293,30 +295,6 @@ static __always_inline notrace int do_boottime(const struct vdso_data *vd, return 0; } -#else /* ARCH_PROVIDES_TIMER */ - -static notrace int do_realtime(const struct vdso_data *vd, struct timespec *ts) -{ - return -1; -} - -static notrace int do_monotonic(const struct vdso_data *vd, struct timespec *ts) -{ - return -1; -} - -static notrace int do_monotonic_raw(const struct vdso_data *vd, - struct timespec *ts) -{ - return -1; -} - -static notrace int do_boottime(const struct vdso_data *vd, - struct timespec *ts) -{ - return -1; -} - #endif /* ARCH_PROVIDES_TIMER */ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) @@ -330,6 +308,7 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) case CLOCK_MONOTONIC_COARSE: do_monotonic_coarse(vd, ts); break; +#ifdef ARCH_PROVIDES_TIMER case CLOCK_REALTIME: if (do_realtime(vd, ts)) goto fallback; @@ -346,6 +325,7 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) if (do_boottime(vd, ts)) goto fallback; break; +#endif default: goto fallback; } @@ -355,6 +335,7 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) return clock_gettime_fallback(clock, ts); } +#ifdef ARCH_PROVIDES_TIMER notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) { const struct vdso_data *vd = __get_datapage(); @@ -376,21 +357,28 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) return 0; } +#endif int __vdso_clock_getres(clockid_t clock_id, struct timespec *res) { typeof(res->tv_nsec) nsec; - if (clock_id == CLOCK_REALTIME || - clock_id == CLOCK_BOOTTIME || - 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) + switch (clock_id) { + case CLOCK_REALTIME_COARSE: + case CLOCK_MONOTONIC_COARSE: nsec = LOW_RES_NSEC; - else + break; +#ifdef ARCH_PROVIDES_TIMER + case CLOCK_REALTIME: + case CLOCK_MONOTONIC: + case CLOCK_MONOTONIC_RAW: + case CLOCK_BOOTTIME: + nsec = MONOTONIC_RES_NSEC; + break; +#endif + default: return clock_getres_fallback(clock_id, res); + } if (likely(res != NULL)) { res->tv_sec = 0;