From patchwork Fri Nov 21 19:44:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 41356 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0C8F02452C for ; Fri, 21 Nov 2014 19:44:43 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf110690wib.6 for ; Fri, 21 Nov 2014 11:44:42 -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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=LBtpolnrGDTAIjdLD3Solv8CGf68+nAn9mKFyqTgkSA=; b=SmJSh77EQaJ94FGIA0yO2jM5UZCWOC5r1MCJbSaXHcrhdmjc25+uwTmBZnf6fpHdIs F8ECWbB73M6LgkNORcbj1jai1W2L/03r/O9FlGxJVLijB5mTxw5x4kbsecnm2fhc8zpO W3PHC+SfuVzqPngwJDsc9s6j5vP+/VIqz4lgCOVqAsvPKmU8U4Je12cvT4imL2uRbPuc nUYlwGatAgduWDy1LA1GujX+Sd+h9mXvT++ZtTr3oYuSLc8QRp0OQCunvselYVxjCtN0 geS5+4H8MoCv5kJxFt8b4OXpuBG8JQn2b2c+UILQsii5SNPOL02ZDA5jN8Chy5LFhWlV 3iug== X-Gm-Message-State: ALoCoQknU3/7UgnE/BaBNDYmLuEGGAxifjPPfob458GsIEtUgwSRq7fs+mi3Wr5G7SZYujOlFhDg X-Received: by 10.112.125.6 with SMTP id mm6mr2107490lbb.8.1416599082295; Fri, 21 Nov 2014 11:44:42 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.2 with SMTP id m2ls250581laj.70.gmail; Fri, 21 Nov 2014 11:44:42 -0800 (PST) X-Received: by 10.152.7.229 with SMTP id m5mr7416856laa.32.1416599082031; Fri, 21 Nov 2014 11:44:42 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id f10si6993891lab.102.2014.11.21.11.44.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 11:44:42 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id hs14so4833834lab.36 for ; Fri, 21 Nov 2014 11:44:42 -0800 (PST) X-Received: by 10.152.43.79 with SMTP id u15mr3522411lal.29.1416599081943; Fri, 21 Nov 2014 11:44:41 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp153723lbc; Fri, 21 Nov 2014 11:44:41 -0800 (PST) X-Received: by 10.70.41.13 with SMTP id b13mr10427839pdl.20.1416599079167; Fri, 21 Nov 2014 11:44:39 -0800 (PST) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com. [209.85.220.53]) by mx.google.com with ESMTPS id yu4si5299905pbb.107.2014.11.21.11.44.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 11:44:39 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.53 as permitted sender) client-ip=209.85.220.53; Received: by mail-pa0-f53.google.com with SMTP id kq14so5514069pab.12 for ; Fri, 21 Nov 2014 11:44:38 -0800 (PST) X-Received: by 10.66.242.238 with SMTP id wt14mr10391603pac.60.1416599078423; Fri, 21 Nov 2014 11:44:38 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id t9sm5513621pbs.75.2014.11.21.11.44.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Nov 2014 11:44:37 -0800 (PST) From: John Stultz To: lkml Cc: "pang.xunlei" , Thomas Gleixner , Ingo Molnar , Arnd Bergmann , Miroslav Lichvar , Richard Cochran , Prarit Bhargava , Alessandro Zummo , John Stultz Subject: [PATCH 04/12] time: Provide y2038 safe do_settimeofday() replacement Date: Fri, 21 Nov 2014 11:44:10 -0800 Message-Id: <1416599058-13836-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416599058-13836-1-git-send-email-john.stultz@linaro.org> References: <1416599058-13836-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@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.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "pang.xunlei" 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. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Arnd Bergmann Cc: pang.xunlei Cc: Miroslav Lichvar Cc: Richard Cochran Cc: Prarit Bhargava Cc: Alessandro Zummo Signed-off-by: pang.xunlei Signed-off-by: John Stultz --- 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.