From patchwork Tue Nov 18 11:15:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 41008 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7C5F6241C9 for ; Tue, 18 Nov 2014 11:20:25 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf12600918lbg.1 for ; Tue, 18 Nov 2014 03:20:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=TA5HSViNEGJwIrhbzUer9PPIR+lqypZdsOKazabISr0=; b=MOKAwRymp0l633n2uiOlfswJxQljw7yStrU56+P6e3fK05kgGFbB6Yhszr/FzJPiSu biud+g/spWa30dnvE4i0U4f8Ku7veoDrKeB5Aq4pgji7W+LcpJhmULPhpNe4KWODY56a csk1iWeTjAC37/JF1Q6y+8I3kprqYCO1w3MJoQLCkUZguX+wbHvsyNtIQnaPj09QQYWS 1rDIldIsJp0OqO/WQpOeLKm1mpoDv2LzUMx2Zhzy1UZzd2H2n57l6UZMGdTsxfhSgA5w P516DBp4wrYb6rB+j83+2LJGCQuhXf+C5xrmtS+kJqP9rytQRSV2bIVtmmJ5TlEhJWVQ Wkbw== X-Gm-Message-State: ALoCoQksdrygjOC+HkYKZ+TOE38TwWohn7WwEH0zMOcd/Bnzp3tuc6vqQk3/StnoiWXrtaurNszq X-Received: by 10.180.19.42 with SMTP id b10mr283579wie.0.1416309624170; Tue, 18 Nov 2014 03:20:24 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.134 with SMTP id s6ls1069643las.27.gmail; Tue, 18 Nov 2014 03:20:23 -0800 (PST) X-Received: by 10.152.198.235 with SMTP id jf11mr18345086lac.72.1416309623544; Tue, 18 Nov 2014 03:20:23 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id p5si20788601lbo.69.2014.11.18.03.20.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Nov 2014 03:20:23 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id ge10so179050lab.31 for ; Tue, 18 Nov 2014 03:20:23 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr34751343laz.27.1416309623348; Tue, 18 Nov 2014 03:20:23 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp1310452lbc; Tue, 18 Nov 2014 03:20:21 -0800 (PST) X-Received: by 10.70.88.44 with SMTP id bd12mr10431362pdb.133.1416309620965; Tue, 18 Nov 2014 03:20:20 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v5si3182988pdq.121.2014.11.18.03.20.20 for ; Tue, 18 Nov 2014 03:20:20 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753920AbaKRLUQ (ORCPT + 26 others); Tue, 18 Nov 2014 06:20:16 -0500 Received: from mail-pd0-f171.google.com ([209.85.192.171]:49491 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751699AbaKRLUO (ORCPT ); Tue, 18 Nov 2014 06:20:14 -0500 Received: by mail-pd0-f171.google.com with SMTP id v10so41693pde.16 for ; Tue, 18 Nov 2014 03:20:14 -0800 (PST) X-Received: by 10.70.2.65 with SMTP id 1mr36923448pds.13.1416309614050; Tue, 18 Nov 2014 03:20:14 -0800 (PST) Received: from wangdeqiang.com ([210.21.223.3]) by mx.google.com with ESMTPSA id l13sm7556923pbq.40.2014.11.18.03.20.09 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Nov 2014 03:20:13 -0800 (PST) From: "pang.xunlei" To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, Thomas Gleixner , Alessandro Zummo , John Stultz , Arnd Bergmann , "pang.xunlei" Subject: [RFC PATCH v3 1/5] time: Provide y2038 safe do_settimeofday() replacement Date: Tue, 18 Nov 2014 19:15:16 +0800 Message-Id: <1416309320-7498-2-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1416309320-7498-1-git-send-email-pang.xunlei@linaro.org> References: <1416309320-7498-1-git-send-email-pang.xunlei@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pang.xunlei@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The kernel uses 32-bit signed value(time_t) for seconds elapsed 1970-01-01:00:00:00, thus it will overflow at 2038-01-19 03:14:08 on 32-bit systems. This is widely known as the y2038 problem. As part of addressing "y2038 problem" for in-kernel uses, this patch adds safe do_settimeofday64() using timespec64. After this patch, do_settimeofday() is deprecated and all its call sites will be fixed using do_settimeofday64(), after that it can be removed. Signed-off-by: pang.xunlei --- include/linux/timekeeping.h | 21 ++++++++++++++++++++- kernel/time/timekeeping.c | 19 +++++++++---------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 1caa6b0..071ad7e 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -10,7 +10,7 @@ extern int timekeeping_suspended; * Get and set timeofday */ extern void do_gettimeofday(struct timeval *tv); -extern int do_settimeofday(const struct timespec *tv); +extern int do_settimeofday64(const struct timespec64 *ts); extern int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz); @@ -33,6 +33,14 @@ extern int __getnstimeofday64(struct timespec64 *tv); extern void getnstimeofday64(struct timespec64 *tv); #if BITS_PER_LONG == 64 +/** + * Deprecated. Use do_settimeofday64(). + */ +static inline int do_settimeofday(const struct timespec *ts) +{ + return do_settimeofday64(ts); +} + static inline int __getnstimeofday(struct timespec *ts) { return __getnstimeofday64(ts); @@ -54,6 +62,17 @@ static inline void ktime_get_real_ts(struct timespec *ts) } #else +/** + * Deprecated. Use do_settimeofday64(). + */ +static inline int do_settimeofday(const struct timespec *ts) +{ + struct timespec64 ts64; + + ts64 = timespec_to_timespec64(*ts); + return do_settimeofday64(&ts64); +} + static inline int __getnstimeofday(struct timespec *ts) { struct timespec64 ts64; diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index ec1791f..1d33550 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -703,18 +703,18 @@ void do_gettimeofday(struct timeval *tv) EXPORT_SYMBOL(do_gettimeofday); /** - * do_settimeofday - Sets the time of day - * @tv: pointer to the timespec variable containing the new time + * do_settimeofday64 - Sets the time of day. + * @ts: pointer to the timespec64 variable containing the new time * * Sets the time of day to the new time and update NTP and notify hrtimers */ -int do_settimeofday(const struct timespec *tv) +int do_settimeofday64(const struct timespec64 *ts) { struct timekeeper *tk = &tk_core.timekeeper; - struct timespec64 ts_delta, xt, tmp; + struct timespec64 ts_delta, xt; unsigned long flags; - if (!timespec_valid_strict(tv)) + if (!timespec64_valid_strict(ts)) return -EINVAL; raw_spin_lock_irqsave(&timekeeper_lock, flags); @@ -723,13 +723,12 @@ int do_settimeofday(const struct timespec *tv) timekeeping_forward_now(tk); xt = tk_xtime(tk); - ts_delta.tv_sec = tv->tv_sec - xt.tv_sec; - ts_delta.tv_nsec = tv->tv_nsec - xt.tv_nsec; + ts_delta.tv_sec = ts->tv_sec - xt.tv_sec; + ts_delta.tv_nsec = ts->tv_nsec - xt.tv_nsec; tk_set_wall_to_mono(tk, timespec64_sub(tk->wall_to_monotonic, ts_delta)); - tmp = timespec_to_timespec64(*tv); - tk_set_xtime(tk, &tmp); + tk_set_xtime(tk, ts); timekeeping_update(tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET); @@ -741,7 +740,7 @@ int do_settimeofday(const struct timespec *tv) return 0; } -EXPORT_SYMBOL(do_settimeofday); +EXPORT_SYMBOL(do_settimeofday64); /** * timekeeping_inject_offset - Adds or subtracts from the current time.