From patchwork Mon Jun 1 11:55:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 49304 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6EF3B218FC for ; Mon, 1 Jun 2015 11:56:35 +0000 (UTC) Received: by wibbk2 with SMTP id bk2sf22138339wib.2 for ; Mon, 01 Jun 2015 04:56:34 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=Uz8MlfrKQcoF+wTTfgaeF2DV62Kd8HMg/qkn46iHWCc=; b=UI3SIaUfdbMlCUNX4xZvuQMzAYuoZzZuyYpvux3DZD6EitrlPsprywaEkt8rLPsGCP MQIAzXloNoGEXYv/zr90IyDvDBKM9JHP7ku8R+sGqfJONUbKrA260+zkjrxhSW+D9ClT jlfDv7krjG3I7bhELwAs8aIBh6cvBcwa6IISDg7jV6D1AndvsbUJUtr7JklaxrmWJEPf fFU+BDv++puWZVfTeA7SYrrSJYGfT49O4NdFL/R0pbJebs4NNz1roRAYKqvFEx32ubVY jw/KmJ57cnSibtsi3Gi9sHMrZVSlBy4fzqgewyra68+yzi1VxjdfHfN+l7b59Bxk812N iGkg== X-Gm-Message-State: ALoCoQkerruVHUHtQZ2et5Pq1jcG9FiRYSEWrbMn8wzOhsCYZaUb9YqrRrCMTJG97FnzEGzXLXQq X-Received: by 10.152.3.131 with SMTP id c3mr11955942lac.4.1433159794622; Mon, 01 Jun 2015 04:56:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.1.105 with SMTP id 9ls19864lal.17.gmail; Mon, 01 Jun 2015 04:56:34 -0700 (PDT) X-Received: by 10.112.163.168 with SMTP id yj8mr20676722lbb.36.1433159794443; Mon, 01 Jun 2015 04:56:34 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id k9si12109104lah.119.2015.06.01.04.56.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2015 04:56:34 -0700 (PDT) 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 laei3 with SMTP id i3so11660660lae.3 for ; Mon, 01 Jun 2015 04:56:34 -0700 (PDT) X-Received: by 10.152.7.7 with SMTP id f7mr20951408laa.106.1433159794339; Mon, 01 Jun 2015 04:56:34 -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.108.230 with SMTP id hn6csp2258127lbb; Mon, 1 Jun 2015 04:56:33 -0700 (PDT) X-Received: by 10.68.131.65 with SMTP id ok1mr2447470pbb.16.1433159792397; Mon, 01 Jun 2015 04:56:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c11si21202579pat.225.2015.06.01.04.56.30; Mon, 01 Jun 2015 04:56:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752778AbbFAL4R (ORCPT + 28 others); Mon, 1 Jun 2015 07:56:17 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:36702 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751797AbbFAL4B (ORCPT ); Mon, 1 Jun 2015 07:56:01 -0400 Received: by pacux9 with SMTP id ux9so67539512pac.3 for ; Mon, 01 Jun 2015 04:56:00 -0700 (PDT) X-Received: by 10.70.24.130 with SMTP id u2mr40254381pdf.147.1433159760892; Mon, 01 Jun 2015 04:56:00 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by mx.google.com with ESMTPSA id ld1sm14035912pbc.26.2015.06.01.04.55.58 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jun 2015 04:56:00 -0700 (PDT) From: Baolin Wang To: tglx@linutronix.de Cc: arnd@arndb.de, linux-kernel@vger.kernel.org, baolin.wang@linaro.org, y2038@lists.linaro.org Subject: [PATCH v4 08/25] posix-timers:Convert to the 64bit methods for the timer_gettime syscall function Date: Mon, 1 Jun 2015 19:55:47 +0800 Message-Id: <1433159747-4854-1-git-send-email-baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 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: baolin.wang@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 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: , This patch introduces the timer_get64 method with itimerspec64 type for k_clock structure, that makes it ready for the 2038 year. Convert to the 64bit method with itimerspec64 type for the timer_gettime syscall function, and change the timer_gettime syscall implementation. Also add a default 64bit method for the timer_get64 pointer of k_clock structure, and it will be removed after all the drivers are converted to 64bit methods. Signed-off-by: Baolin Wang --- include/linux/posix-timers.h | 2 ++ kernel/time/posix-timers.c | 25 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index 907f3fd..e84436b 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -113,6 +113,8 @@ struct k_clock { #define TIMER_RETRY 1 void (*timer_get) (struct k_itimer * timr, struct itimerspec * cur_setting); + void (*timer_get64) (struct k_itimer *timr, + struct itimerspec64 *cur_setting); }; extern struct k_clock clock_posix_cpu; diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index d00f8ed..2adeb29 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -140,6 +140,7 @@ static int common_timer_del(struct k_itimer *timer); static enum hrtimer_restart posix_timer_fn(struct hrtimer *data); static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags); +static struct k_clock *clockid_to_kclock(const clockid_t id); #define lock_timer(tid, flags) \ ({ struct k_itimer *__timr; \ @@ -542,6 +543,16 @@ static struct pid *good_sigevent(sigevent_t * event) return task_pid(rtn); } +static void default_timer_get64(struct k_itimer *timr, + struct itimerspec64 *cur_setting64) +{ + struct itimerspec cur_setting; + struct k_clock *kc = clockid_to_kclock(timr->it_clock); + + kc->timer_get(timr, &cur_setting); + *cur_setting64 = itimerspec_to_itimerspec64(&cur_setting); +} + void posix_timers_register_clock(const clockid_t clock_id, struct k_clock *new_clock) { @@ -562,6 +573,9 @@ void posix_timers_register_clock(const clockid_t clock_id, return; } + if (new_clock->timer_get && !new_clock->timer_get64) + new_clock->timer_get64 = default_timer_get64; + posix_clocks[clock_id] = *new_clock; } EXPORT_SYMBOL_GPL(posix_timers_register_clock); @@ -795,7 +809,7 @@ common_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting) cur_setting->it_value = ktime_to_timespec(remaining); } -static int __timer_gettime(timer_t timer_id, struct itimerspec *cur_setting) +static int __timer_gettime(timer_t timer_id, struct itimerspec64 *cur_setting) { struct k_itimer *timr; struct k_clock *kc; @@ -807,10 +821,10 @@ static int __timer_gettime(timer_t timer_id, struct itimerspec *cur_setting) return -EINVAL; kc = clockid_to_kclock(timr->it_clock); - if (WARN_ON_ONCE(!kc || !kc->timer_get)) + if (WARN_ON_ONCE(!kc || !kc->timer_get64)) ret = -EINVAL; else - kc->timer_get(timr, cur_setting); + kc->timer_get64(timr, cur_setting); unlock_timer(timr, flags); return ret; @@ -820,10 +834,11 @@ static int __timer_gettime(timer_t timer_id, struct itimerspec *cur_setting) SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id, struct itimerspec __user *, setting) { - struct itimerspec cur_setting; + struct itimerspec64 cur_setting; + int ret = __timer_gettime(timer_id, &cur_setting); - if (!ret && copy_to_user(setting, &cur_setting, sizeof (cur_setting))) + if (!ret && put_itimerspec(&cur_setting, setting)) return -EFAULT; return ret;