From patchwork Mon Oct 27 05:46:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 39549 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 8C92B24026 for ; Mon, 27 Oct 2014 05:47:53 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id l4sf34266lbv.1 for ; Sun, 26 Oct 2014 22:47:52 -0700 (PDT) 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=TsR7VYM/VjJn08WwbjPe+uSte83Z1y6VOJQmMIOX/Uk=; b=C9GmttWkir+k7F6fC6RzcDo+lZLUhhiDiEGAmIZVoZ8GSdznLKmzt2m81tWEYtZHZ0 aIINt/UpxgPjnDAg0Ubfrwe5OHBtK3jt7rZ45Kv5FwKtDlquypcmbYRjs9/CVfYHf7Z0 /kQ7cC2KuaV+khL/PuYsomti3K8gtyfKlNoShYUhIvZXz36yqs0k20cDHqGcW3Q7NpNK vuQcL/ickOF3i0k2ZAI8YZV0chFuKUdlS4TMnXqhR6PSbaKFIIkaoPZlSIr0dg2ZbEn4 +NLTjLlUq0N4h6L9yUwm/Xjn8goPlZUlKUcrYWdYr7KRvMnXqubTetoFudW6UCg+rQf7 O2kw== X-Gm-Message-State: ALoCoQkDAf2x7qxmIk1NBxjod3QLgke776uqJS3DQ92f7tlpUEiPAp6/MiupqC04ZG1kGaq3G89J X-Received: by 10.180.93.35 with SMTP id cr3mr3493137wib.2.1414388872426; Sun, 26 Oct 2014 22:47:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.134 with SMTP id b6ls563785laa.77.gmail; Sun, 26 Oct 2014 22:47:52 -0700 (PDT) X-Received: by 10.112.134.39 with SMTP id ph7mr20966132lbb.45.1414388872243; Sun, 26 Oct 2014 22:47:52 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id tj1si18209529lbb.73.2014.10.26.22.47.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:47:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id f15so1387192lbj.37 for ; Sun, 26 Oct 2014 22:47:52 -0700 (PDT) X-Received: by 10.112.140.5 with SMTP id rc5mr1759597lbb.32.1414388872153; Sun, 26 Oct 2014 22:47:52 -0700 (PDT) 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.84.229 with SMTP id c5csp235704lbz; Sun, 26 Oct 2014 22:47:51 -0700 (PDT) X-Received: by 10.70.34.100 with SMTP id y4mr22415976pdi.26.1414388867550; Sun, 26 Oct 2014 22:47:47 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xk2si9682613pbc.66.2014.10.26.22.47.46 for ; Sun, 26 Oct 2014 22:47:47 -0700 (PDT) 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 S1752344AbaJ0Frm (ORCPT + 26 others); Mon, 27 Oct 2014 01:47:42 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:54226 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752261AbaJ0Frh (ORCPT ); Mon, 27 Oct 2014 01:47:37 -0400 Received: by mail-pd0-f181.google.com with SMTP id y10so628941pdj.26 for ; Sun, 26 Oct 2014 22:47:36 -0700 (PDT) X-Received: by 10.68.167.99 with SMTP id zn3mr22028351pbb.30.1414388856672; Sun, 26 Oct 2014 22:47:36 -0700 (PDT) Received: from wangdeqiang.com ([210.21.227.66]) by mx.google.com with ESMTPSA id jq5sm9723922pbc.32.2014.10.26.22.47.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:47:36 -0700 (PDT) From: "pang.xunlei" To: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Cc: John Stultz , Thomas Gleixner , Alessandro Zummo , "pang.xunlei" Subject: [PATCH RFC 08/12] time: Add rtc_time_to_tm() safe version(using time64_t) Date: Mon, 27 Oct 2014 13:46:38 +0800 Message-Id: <1414388802-5866-7-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414388802-5866-1-git-send-email-pang.xunlei@linaro.org> References: <1414388802-5866-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.217.178 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 since 1970-01-01:00:00:00, thus it will overflow at 2038-01-19 03:14:08 on 32-bit systems. We call this "2038 safety" issue. As part of addressing 2038 saftey for in-kernel uses, this patch adds the safe rtc_time_to_tm() using time64_t. After this patch, rtc_time_to_tm_unsafe() should be replaced by rtc_time_to_tm() one by one. Eventually, rtc_time_to_tm_unsafe() will be removed from the kernel when it has no users. Signed-off-by: pang.xunlei --- drivers/rtc/rtc-lib.c | 18 ++++++++++++++---- include/linux/rtc.h | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c index 34bcca9..cbbc9a6 100644 --- a/drivers/rtc/rtc-lib.c +++ b/drivers/rtc/rtc-lib.c @@ -48,12 +48,12 @@ EXPORT_SYMBOL(rtc_year_days); /* * Convert seconds since 01-01-1970 00:00:00 to Gregorian date. */ -void rtc_time_to_tm_unsafe(unsigned long time, struct rtc_time *tm) +void rtc_time_to_tm(time64_t time, struct rtc_time *tm) { unsigned int month, year; int days; - days = time / 86400; + days = div_s64(time, 86400); time -= (unsigned int) days * 86400; /* day of the week, 1970-01-01 was a Thursday */ @@ -81,13 +81,23 @@ void rtc_time_to_tm_unsafe(unsigned long time, struct rtc_time *tm) tm->tm_mon = month; tm->tm_mday = days + 1; - tm->tm_hour = time / 3600; + tm->tm_hour = div_s64(time, 3600); time -= tm->tm_hour * 3600; - tm->tm_min = time / 60; + tm->tm_min = div_s64(time, 60); tm->tm_sec = time - tm->tm_min * 60; tm->tm_isdst = 0; } +EXPORT_SYMBOL(rtc_time_to_tm); + +/* TODO: [2038 safety] unsafe for legacy, and should be replaced by rtc_time_to_tm() */ +void rtc_time_to_tm_unsafe(unsigned long time, struct rtc_time *tm) +{ + time64_t time64; + + time64 = (time64_t)time; + rtc_time_to_tm(time64, tm); +} EXPORT_SYMBOL(rtc_time_to_tm_unsafe); /* diff --git a/include/linux/rtc.h b/include/linux/rtc.h index d1f878c..1994399 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -21,6 +21,7 @@ extern int rtc_year_days(unsigned int day, unsigned int month, unsigned int year extern int rtc_valid_tm(struct rtc_time *tm); extern int rtc_tm_to_time(struct rtc_time *tm, time64_t *time); extern int rtc_tm_to_time_unsafe(struct rtc_time *tm, unsigned long *time); +extern void rtc_time_to_tm(time64_t time, struct rtc_time *tm); extern void rtc_time_to_tm_unsafe(unsigned long time, struct rtc_time *tm); ktime_t rtc_tm_to_ktime(struct rtc_time tm); struct rtc_time rtc_ktime_to_tm(ktime_t kt);