From patchwork Tue Oct 18 03:27:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9381209 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 BB45E607D4 for ; Tue, 18 Oct 2016 03:28:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A507928DDE for ; Tue, 18 Oct 2016 03:28:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 993E1291BE; Tue, 18 Oct 2016 03:28:24 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ED2228DDE for ; Tue, 18 Oct 2016 03:28:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933520AbcJRD2D (ORCPT ); Mon, 17 Oct 2016 23:28:03 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36335 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933364AbcJRD1w (ORCPT ); Mon, 17 Oct 2016 23:27:52 -0400 Received: by mail-pf0-f195.google.com with SMTP id r16so13963632pfg.3; Mon, 17 Oct 2016 20:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vuqamaa1yHFiyTYKzWfHww88vjGsv6ENhPxUHcZcsPk=; b=LRpNGvlCPAb909176pltD1BcScfrUJnZ/yJZ1Fux6Mt6YDCbdbI2zPel0wreWVN9Uy GNXzCUe1cqEgPWgkHUCf/xt1CrC8jvFqWRaCpeMjYdZ8LlxIpSGWCQHCquJV596JwZZg 7pziQ/YGoZyNctaK9Nw05HyOkMLx9pAi9FzASZ6dPnNg6Q8eznjupG38jUmNuHuzTCEU xpZ9bfRZJedBZ9nt67c2DNV1X39ekPLzXuxEe1+P23bos/Anqe8yMO6+8/zhicyrrUAh pAL6Iv6LqUPAnhGAPCclMx30phr4XtEXRz6RAWMWPIj4PuwNalbZwL2X8HOnqCZQKPzz XBaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vuqamaa1yHFiyTYKzWfHww88vjGsv6ENhPxUHcZcsPk=; b=I57aRAbK/ZSXz9F9Arv3RX5jjocs5FcAw/YGgrLj9wU7OPqBd0/Iw/hn9YG4VXdiDw c75SxtIviPel4gNQ/lHjEjhlXUUfdoqmsn45YmUuZUe4yqNjXTkE8YGqhkXDjFtqHYea Cck74nwCrN9LfVEFjP/YZx8w3pVZFnYh/jphG4ErwLpgUmK7FpG4LyfPxxULBZ37wv28 bsGl72IzLL8c7Zem1KFBwGAI2HRaBUfpFBONUihMovT5nOA+SAuuzLHt/ELhuj0jtKK/ yohVSz3DFSezDIHU3kXR1ems0EB54CTFrRWrOzVYTZiABbCxWGXuHmTUdOB05BBfBWLT a0oQ== X-Gm-Message-State: AA6/9RmYxPetTM3iGnXIsmRux4TyunU5iDpEZhjRaJRmY/ojr2ShsEgiPV9hR78ldvo8nw== X-Received: by 10.99.64.132 with SMTP id n126mr904444pga.87.1476761271165; Mon, 17 Oct 2016 20:27:51 -0700 (PDT) Received: from deepa-ubuntu.hsd1.ca.comcast.net ([2601:647:5000:6620:39de:ebb7:c517:eba0]) by smtp.gmail.com with ESMTPSA id h185sm20707305pfe.35.2016.10.17.20.27.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Oct 2016 20:27:50 -0700 (PDT) From: Deepa Dinamani To: Dmitry Torokhov , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, y2038@lists.linaro.org Subject: [PATCH v2 1/4] uinput: Add ioctl for using monotonic/ boot times Date: Mon, 17 Oct 2016 20:27:30 -0700 Message-Id: <1476761253-13450-2-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476761253-13450-1-git-send-email-deepa.kernel@gmail.com> References: <1476761253-13450-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP struct timeval which is part of struct input_event to maintain the event times is not y2038 safe. Real time timestamps are also not ideal for input_event as this time can go backwards as noted in the patch a80b83b7b8 by John Stultz. Arnd Bergmann suggested deprecating real time and using monotonic or other timers for all input_event times as a solution to both the above problems. Add a new ioctl to let the user dictate the kind of time to be used for input events. This is similar to the evdev implementation of the feature. Realtime is still the default time. This is to maintain backward compatibility. The structure to maintain input events will be changed in a different patch. Signed-off-by: Deepa Dinamani --- drivers/input/misc/uinput.c | 56 ++++++++++++++++++++++++++++++++++++++++++++- include/linux/uinput.h | 1 + include/uapi/linux/uinput.h | 3 +++ 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 92595b9..3d75c5a 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -46,11 +46,26 @@ static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) { struct uinput_device *udev = input_get_drvdata(dev); + struct timespec64 ts; udev->buff[udev->head].type = type; udev->buff[udev->head].code = code; udev->buff[udev->head].value = value; - do_gettimeofday(&udev->buff[udev->head].time); + + switch (udev->clk_type) { + case CLOCK_REALTIME: + ktime_get_real_ts64(&ts); + break; + case CLOCK_MONOTONIC: + ktime_get_ts64(&ts); + break; + case CLOCK_BOOTTIME: + get_monotonic_boottime64(&ts); + break; + } + + udev->buff[udev->head].time.tv_sec = ts.tv_sec; + udev->buff[udev->head].time.tv_usec = ts.tv_nsec / NSEC_PER_USEC; udev->head = (udev->head + 1) % UINPUT_BUFFER_SIZE; wake_up_interruptible(&udev->waitq); @@ -295,6 +310,7 @@ static int uinput_create_device(struct uinput_device *udev) if (error) goto fail2; + udev->clk_type = CLOCK_REALTIME; udev->state = UIST_CREATED; return 0; @@ -304,6 +320,38 @@ static int uinput_create_device(struct uinput_device *udev) return error; } +static int uinput_set_clk_type(struct uinput_device *udev, unsigned int clkid) +{ + unsigned int clk_type; + + if (udev->state != UIST_CREATED) + return -EINVAL; + + switch (clkid) { + /* Realtime clock is only valid until year 2038.*/ + case CLOCK_REALTIME: + clk_type = CLOCK_REALTIME; + break; + case CLOCK_MONOTONIC: + clk_type = CLOCK_MONOTONIC; + break; + case CLOCK_BOOTTIME: + clk_type = CLOCK_BOOTTIME; + break; + default: + return -EINVAL; + } + + if (udev->clk_type != clk_type) { + udev->clk_type = clk_type; + + /* Flush pending events */ + uinput_flush_requests(udev); + } + + return 0; +} + static int uinput_open(struct inode *inode, struct file *file) { struct uinput_device *newdev; @@ -787,6 +835,7 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, char *phys; const char *name; unsigned int size; + int clock_id; retval = mutex_lock_interruptible(&udev->mutex); if (retval) @@ -817,6 +866,11 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, retval = uinput_dev_setup(udev, p); goto out; + case UI_SET_CLOCKID: + if (copy_from_user(&clock_id, p, sizeof(unsigned int))) + return -EFAULT; + return uinput_set_clk_type(udev, clock_id); + /* UI_ABS_SETUP is handled in the variable size ioctls */ case UI_SET_EVBIT: diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 75de43d..6527fb7 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h @@ -72,6 +72,7 @@ struct uinput_device { unsigned char head; unsigned char tail; struct input_event buff[UINPUT_BUFFER_SIZE]; + int clk_type; unsigned int ff_effects_max; struct uinput_request *requests[UINPUT_NUM_REQUESTS]; diff --git a/include/uapi/linux/uinput.h b/include/uapi/linux/uinput.h index dc652e2..d9494ae 100644 --- a/include/uapi/linux/uinput.h +++ b/include/uapi/linux/uinput.h @@ -133,6 +133,9 @@ struct uinput_abs_setup { */ #define UI_ABS_SETUP _IOW(UINPUT_IOCTL_BASE, 4, struct uinput_abs_setup) +/* Set clockid to be used for timestamps */ +#define UI_SET_CLOCKID _IOW(UINPUT_IOCTL_BASE, 5, int) + #define UI_SET_EVBIT _IOW(UINPUT_IOCTL_BASE, 100, int) #define UI_SET_KEYBIT _IOW(UINPUT_IOCTL_BASE, 101, int) #define UI_SET_RELBIT _IOW(UINPUT_IOCTL_BASE, 102, int)