From patchwork Mon Dec 4 00:55:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 10089493 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 564A960327 for ; Mon, 4 Dec 2017 00:56:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3645C28D5D for ; Mon, 4 Dec 2017 00:56:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2950D28D61; Mon, 4 Dec 2017 00:56:59 +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=unavailable 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 779D028D5D for ; Mon, 4 Dec 2017 00:56:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752956AbdLDA4n (ORCPT ); Sun, 3 Dec 2017 19:56:43 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:43511 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752938AbdLDA4j (ORCPT ); Sun, 3 Dec 2017 19:56:39 -0500 Received: by mail-pg0-f67.google.com with SMTP id b18so7026969pgv.10; Sun, 03 Dec 2017 16:56:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1D4W7Q0TCfNRGah547zIbHHJYSoJY0sJeJWDy4I7U+o=; b=Ij6g0qRDln8bk9I0w7buzcrLTjA5b4VgooWRt52yz8CwXMkTiPeoTPtPGBUMpL/R7V rtjqRujB0BYpHZBaCWipmWmZjGkNyz++PjQSugazu9e3gxq4TyzD49nGGqmBxp8kGWy7 2xNL2MaOpb3gc9V3wBBKdniN4dGjsMNUPYI9jSqQKS5oHjMNPYIU9i5VVYQiOZuEeQmU 5kmBQAFwviJ/UiAZxMWv3SRCFUg6gQ0+yqiTbavRQiQRwQb+Sqd9W2Fx+2ZvD6oCUtAr 9If123LUzC6P1NJNWv+yjK4uk3szkDx0GbEgp/q3Fnwo8jJgcfjRTwULAOVtccj2rUch 90fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1D4W7Q0TCfNRGah547zIbHHJYSoJY0sJeJWDy4I7U+o=; b=ilmiYD53T6VFdJxi/6AH2aOGzvgp7cCX3JJCEo2/0DNXyxcZmr6VBSKgwNo70TdsB2 Z7DVJ7CAxdXt3SXW2Jfyq8q1Bj0jJNJG3/BveEKRa5tEkVgvgEldDMPWysmUucqyX1yB d3cjni73i+KIFx+eENPzO+YIOgaQF94Pcau+DTmEHw8+r+GhwFJRD05Ky31RUruPvoqm eGwA8wlkoccyKbXANGvV6jJIdkqqAeW/6qURSErTG4wSi8ud0IR9hPmXvHgcpZZy9HTj eAJNA5R23Ze97bHxkg8Cz8KCHUS2kspw3ccPcyM/tSya34l8t0Fq/IShxeTipjHhiZBe 7gpg== X-Gm-Message-State: AJaThX7jFMOHccWcyiPSF4tw83DhPdTHBPGh2PhWjJ7aS4zx6jVrhYIu R9xxaZH+Z3Tn0fmYkG0o/HM= X-Google-Smtp-Source: AGs4zMY+Of60hYv73GN1sQ8c9ByBbmldQ81QU/E+8nO+JH2l7+Obmikn1d+tp3QC5SOV5zh5yda0BA== X-Received: by 10.98.67.78 with SMTP id q75mr17691348pfa.110.1512348998576; Sun, 03 Dec 2017 16:56:38 -0800 (PST) Received: from deepa-ubuntu.hsd1.ca.comcast.net ([2601:647:5000:6620:3092:62ad:3bb4:62e5]) by smtp.gmail.com with ESMTPSA id b67sm22056121pfm.19.2017.12.03.16.56.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Dec 2017 16:56:38 -0800 (PST) From: Deepa Dinamani To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, y2038@lists.linaro.org Subject: [PATCH v3 3/4] input: Deprecate real timestamps beyond year 2106 Date: Sun, 3 Dec 2017 16:55:44 -0800 Message-Id: <20171204005545.23325-4-deepa.kernel@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171204005545.23325-1-deepa.kernel@gmail.com> References: <20171204005545.23325-1-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 is not y2038 safe. All usage of timeval in the kernel will be replaced by y2038 safe structures. The change is also necessary as glibc is introducing support for 32 bit applications to use 64 bit time_t. Without this change, many applications would incorrectly interpret values in the struct input_event. More details about glibc at https://sourceware.org/glibc/wiki/Y2038ProofnessDesign . struct input_event maintains time for each input event. Real time timestamps are not ideal for input as this time can go backwards as noted in the patch a80b83b7b8 by John Stultz. Hence, having the input_event.time fields only big enough for monotonic and boot times are sufficient. The change leaves the representation of struct input_event as is on 64 bit architectures. But uses 2 unsigned long values on 32 bit machines to support real timestamps until year 2106. This intentionally breaks the ABI on 32 bit architectures and compat handling on 64 bit architectures. This is as per maintainer's preference to introduce compile time errors rather than run into runtime incompatibilities. The change requires any 32 bit userspace utilities reading or writing from event nodes to update their reading format to match the new input_event. The changes to the popular libraries will be posted once we agree on the kernel change. Suggested-by: Arnd Bergmann Signed-off-by: Deepa Dinamani Reviewed-by: Arnd Bergmann --- drivers/input/evdev.c | 14 ++++++++------ drivers/input/input-compat.c | 11 ++++++----- drivers/input/input-compat.h | 3 ++- include/uapi/linux/input.h | 12 +++++++++++- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index e5dbfc5ff1b0..6172af6476c0 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -135,7 +135,8 @@ static void __evdev_flush_queue(struct evdev_client *client, unsigned int type) continue; } else if (head != i) { /* move entry to fill the gap */ - client->buffer[head].time = ev->time; + client->buffer[head].input_event_sec = ev->input_event_sec; + client->buffer[head].input_event_usec = ev->input_event_usec; client->buffer[head].type = ev->type; client->buffer[head].code = ev->code; client->buffer[head].value = ev->value; @@ -170,8 +171,8 @@ static void __evdev_queue_syn_dropped(struct evdev_client *client) break; } - ev.time.tv_sec = ts.tv_sec; - ev.time.tv_usec = ts.tv_nsec / NSEC_PER_USEC; + ev.input_event_sec = ts.tv_sec; + ev.input_event_usec = ts.tv_nsec / NSEC_PER_USEC; ev.type = EV_SYN; ev.code = SYN_DROPPED; ev.value = 0; @@ -248,7 +249,8 @@ static void __pass_event(struct evdev_client *client, */ client->tail = (client->head - 2) & (client->bufsize - 1); - client->buffer[client->tail].time = event->time; + client->buffer[client->tail].input_event_sec = event->input_event_sec; + client->buffer[client->tail].input_event_usec = event->input_event_usec; client->buffer[client->tail].type = EV_SYN; client->buffer[client->tail].code = SYN_DROPPED; client->buffer[client->tail].value = 0; @@ -276,8 +278,8 @@ static void evdev_pass_values(struct evdev_client *client, return; ts = ev_time[client->clk_type]; - event.time.tv_sec = ts.tv_sec; - event.time.tv_usec = ts.tv_nsec / NSEC_PER_USEC; + event.input_event_sec = ts.tv_sec; + event.input_event_usec = ts.tv_nsec / NSEC_PER_USEC; /* Interrupts are disabled, just acquire the lock. */ spin_lock(&client->buffer_lock); diff --git a/drivers/input/input-compat.c b/drivers/input/input-compat.c index 2186f71c9fe5..419e40b68486 100644 --- a/drivers/input/input-compat.c +++ b/drivers/input/input-compat.c @@ -24,14 +24,15 @@ int input_event_from_user(const char __user *buffer, sizeof(struct input_event_compat))) return -EFAULT; - event->time.tv_sec = compat_event.time.tv_sec; - event->time.tv_usec = compat_event.time.tv_usec; + event->input_event_sec = compat_event.sec; + event->input_event_usec = compat_event.usec; event->type = compat_event.type; event->code = compat_event.code; event->value = compat_event.value; } else { - if (copy_from_user(event, buffer, sizeof(struct input_event))) + if (copy_from_user(event, buffer, + sizeof(struct input_event))) return -EFAULT; } @@ -44,8 +45,8 @@ int input_event_to_user(char __user *buffer, if (in_compat_syscall() && !COMPAT_USE_64BIT_TIME) { struct input_event_compat compat_event; - compat_event.time.tv_sec = event->time.tv_sec; - compat_event.time.tv_usec = event->time.tv_usec; + compat_event.sec = event->input_event_sec; + compat_event.usec = event->input_event_usec; compat_event.type = event->type; compat_event.code = event->code; compat_event.value = event->value; diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h index 1563160a7af3..08cd755e73fd 100644 --- a/drivers/input/input-compat.h +++ b/drivers/input/input-compat.h @@ -18,7 +18,8 @@ #ifdef CONFIG_COMPAT struct input_event_compat { - struct compat_timeval time; + compat_ulong_t sec; + compat_ulong_t usec; __u16 type; __u16 code; __s32 value; diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index 8c5a0bf6ee35..524978e0f27a 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -21,10 +21,20 @@ /* * The event structure itself + * Note that __USE_TIME_BITS64 is defined by libc based on + * application's request to use 64 bit time_t. */ - struct input_event { +#if __BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64) struct timeval time; +#define input_event_sec time.tv_sec +#define input_event_usec time.tv_usec +#else + __kernel_ulong_t __sec; + __kernel_ulong_t __usec; +#define input_event_sec __sec +#define input_event_usec __usec +#endif __u16 type; __u16 code; __s32 value;