Y2038

y2038@lists.linaro.org

1132 discussions

[PATCH] Update libinput to support evdev driver v1.2

by Deepa Dinamani

Update input event structures read from the kernel to match the 1.2 version of the driver. There are no changes to the exposed interfaces of libinput. Note that the patch goes along with the changes to libevdev and mtdev to support the updated kernel driver. The associated kernel driver change is proposed at https://lkml.org/lkml/2016/10/17/1146 . Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- include/linux/input.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- src/evdev.c | 4 ++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/include/linux/input.h b/include/linux/input.h index 4bf3d6d..202798a 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -13,10 +13,29 @@ #include <sys/types.h> #include <linux/types.h> -/* - * The event structure itself +/* The time structure for y2038 safe raw_input_event. + * The fields use unsigned types to extend times until + * year 2106 rather than 2038. */ +struct input_timeval { + __kernel_ulong_t tv_sec; + __kernel_ulong_t tv_usec; +}; + +struct raw_input_event { + struct input_timeval time; + __u16 type; + __u16 code; + __s32 value; +}; + +#ifndef __KERNEL__ +/* Userspace structure. + * Definition maintained here for userspace that is not yet updated to use + * struct raw_input_event. + * Not to be used anywhere within the kernel. + */ struct input_event { struct timeval time; __u16 type; @@ -24,11 +43,37 @@ struct input_event { __s32 value; }; + +static inline void +raw_input_to_input_event(const struct raw_input_event *raw, struct input_event *ev) +{ + ev->time.tv_sec = raw->time.tv_sec; + ev->time.tv_usec = raw->time.tv_usec; + ev->type = raw->type; + ev->code = raw->code; + ev->value = raw->value; +} + +static inline void +input_to_raw_event(const struct input_event *ev, struct raw_input_event *raw) +{ + raw->time.tv_sec = ev->time.tv_sec; + raw->time.tv_usec = ev->time.tv_usec; + raw->type = ev->type; + raw->code = ev->code; + raw->value = ev->value; +} + +#endif + + /* * Protocol version. */ #define EV_VERSION 0x010001 +#define EV_VERSION_1_2 0x010002 + /* * IOCTLs (0x00 - 0x7f) diff --git a/src/evdev.c b/src/evdev.c index f7f7230..5d47119 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -256,7 +256,7 @@ evdev_device_led_update(struct evdev_device *device, enum libinput_led leds) { LIBINPUT_LED_CAPS_LOCK, LED_CAPSL }, { LIBINPUT_LED_SCROLL_LOCK, LED_SCROLLL }, }; - struct input_event ev[ARRAY_LENGTH(map) + 1]; + struct raw_input_event ev[ARRAY_LENGTH(map) + 1]; unsigned int i; if (!(device->seat_caps & EVDEV_DEVICE_KEYBOARD)) @@ -2665,7 +2665,7 @@ evdev_set_device_group(struct evdev_device *device, static inline void evdev_drain_fd(int fd) { - struct input_event ev[24]; + struct raw_input_event ev[24]; size_t sz = sizeof ev; while (read(fd, &ev, sz) == (int)sz) { -- 2.7.4

8 years, 6 months

[PATCH] Update mtdev to support evdev driver v1.2

by Deepa Dinamani

Update input event structures read from the kernel to match the 1.2 version of the driver. There are no changes to the exposed interfaces of the mtdev. The associated kernel driver change is proposed at https://lkml.org/lkml/2016/10/17/1146 . Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- src/evbuf.h | 10 ++++++---- src/iobuf.c | 8 ++++---- src/iobuf.h | 4 +++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/evbuf.h b/src/evbuf.h index 17ea4e7..9ec2da6 100644 --- a/src/evbuf.h +++ b/src/evbuf.h @@ -34,7 +34,7 @@ struct mtdev_evbuf { int head; int tail; - struct input_event buffer[DIM_EVENTS]; + struct raw_input_event buffer[DIM_EVENTS]; }; static inline int evbuf_empty(const struct mtdev_evbuf *evbuf) @@ -43,16 +43,18 @@ static inline int evbuf_empty(const struct mtdev_evbuf *evbuf) } static inline void evbuf_put(struct mtdev_evbuf *evbuf, - const struct input_event *ev) + struct input_event *ev) { - evbuf->buffer[evbuf->head++] = *ev; + input_to_raw_event(ev, &evbuf->buffer[evbuf->head]); + evbuf->head++; evbuf->head &= DIM_EVENTS - 1; } static inline void evbuf_get(struct mtdev_evbuf *evbuf, struct input_event *ev) { - *ev = evbuf->buffer[evbuf->tail++]; + raw_input_to_input_event(&evbuf->buffer[evbuf->tail], ev); + evbuf->tail++; evbuf->tail &= DIM_EVENTS - 1; } diff --git a/src/iobuf.c b/src/iobuf.c index 61ec9c1..6f7c923 100644 --- a/src/iobuf.c +++ b/src/iobuf.c @@ -42,7 +42,7 @@ int mtdev_fetch_event(struct mtdev *dev, int fd, struct input_event *ev) { struct mtdev_iobuf *buf = &dev->state->iobuf; int n = buf->head - buf->tail; - if (n < EVENT_SIZE) { + if (n < RAW_EVENT_SIZE) { if (buf->tail && n > 0) memmove(buf->data, buf->data + buf->tail, n); buf->head = n; @@ -53,10 +53,10 @@ int mtdev_fetch_event(struct mtdev *dev, int fd, struct input_event *ev) return n; buf->head += n; } - if (buf->head - buf->tail < EVENT_SIZE) + if (buf->head - buf->tail < RAW_EVENT_SIZE) return 0; - memcpy(ev, buf->data + buf->tail, EVENT_SIZE); - buf->tail += EVENT_SIZE; + raw_input_to_input_event(buf->data + buf->tail, ev); + buf->tail += RAW_EVENT_SIZE; return 1; } diff --git a/src/iobuf.h b/src/iobuf.h index 09c26c4..7450b01 100644 --- a/src/iobuf.h +++ b/src/iobuf.h @@ -32,7 +32,9 @@ #include "common.h" #define EVENT_SIZE sizeof(struct input_event) -#define DIM_BUFFER (DIM_EVENTS * EVENT_SIZE) +#define RAW_EVENT_SIZE sizeof(struct input_event) + +#define DIM_BUFFER (DIM_EVENTS * RAW_EVENT_SIZE) struct mtdev_iobuf { int head, tail; -- 2.7.4

8 years, 6 months

[PATCH] Update libevdev to support evdev driver v1.2

by Deepa Dinamani

Update input event structures read from the kernel to match the 1.2 version of the driver. Update the UAPI version of the header file input.h to use __inline__ instead of inline to maintain compatibility with the pedantic gcc flag used to test the headers. There are no changes to the exposed interfaces of libevdev. The associated kernel driver change is at https://lkml.org/lkml/2016/10/17/1146 . Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- include/linux/input.h | 47 ++++++++++++++++++++++++++++++++++++++++++ include/linux/uinput.h | 3 +++ libevdev/libevdev-int.h | 31 +++++++++++++++++++--------- libevdev/libevdev.c | 30 ++++++++++++++++++--------- test/test-libevdev-has-event.c | 2 +- 5 files changed, 92 insertions(+), 21 deletions(-) diff --git a/include/linux/input.h b/include/linux/input.h index fbc968f..e253679 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -20,6 +20,29 @@ * The event structure itself */ +/* The time structure for y2038 safe raw_input_event. + * The fields use unsigned types to extend times until + * year 2106 rather than 2038. + */ +struct input_timeval { + __kernel_ulong_t tv_sec; + __kernel_ulong_t tv_usec; +}; + +struct raw_input_event { + struct input_timeval time; + __u16 type; + __u16 code; + __s32 value; +}; + +#ifndef __KERNEL__ + +/* Userspace structure. + * Definition maintained here for userspace that is not yet updated to use + * struct raw_input_event. + * Not to be used anywhere within the kernel. + */ struct input_event { struct timeval time; __u16 type; @@ -27,11 +50,35 @@ struct input_event { __s32 value; }; +static __inline__ void +raw_input_to_input_event(const struct raw_input_event *raw, struct input_event *ev) +{ + ev->time.tv_sec = raw->time.tv_sec; + ev->time.tv_usec = raw->time.tv_usec; + ev->type = raw->type; + ev->code = raw->code; + ev->value = raw->value; +} + +static __inline__ void +input_to_raw_event(const struct input_event *ev, struct raw_input_event *raw) +{ + raw->time.tv_sec = ev->time.tv_sec; + raw->time.tv_usec = ev->time.tv_usec; + raw->type = ev->type; + raw->code = ev->code; + raw->value = ev->value; +} + +#endif + /* * Protocol version. */ #define EV_VERSION 0x010001 +#define EV_VERSION_1_2 0x010002 + /* * IOCTLs (0x00 - 0x7f) diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 434f02d..c7b7054 100644 --- a/include/linux/uinput.h +++ b/include/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) diff --git a/libevdev/libevdev-int.h b/libevdev/libevdev-int.h index e1c7ec5..8539987 100644 --- a/libevdev/libevdev-int.h +++ b/libevdev/libevdev-int.h @@ -105,7 +105,7 @@ struct libevdev { enum SyncState sync_state; enum libevdev_grab_mode grabbed; - struct input_event *queue; + struct raw_input_event *queue; size_t queue_size; /**< size of queue in elements */ size_t queue_next; /**< next event index */ size_t queue_nsync; /**< number of sync events */ @@ -147,7 +147,7 @@ _libevdev_log_priority(const struct libevdev *dev); * @return a pointer to the next element in the queue, or NULL if the queue * is full. */ -static inline struct input_event* +static inline struct raw_input_event* queue_push(struct libevdev *dev) { if (dev->queue_next >= dev->queue_size) @@ -167,8 +167,8 @@ queue_pop(struct libevdev *dev, struct input_event *ev) if (dev->queue_next == 0) return 1; - *ev = dev->queue[--dev->queue_next]; - + raw_input_to_input_event(&dev->queue[dev->queue_next-1], ev); + --dev->queue_next; return 0; } @@ -177,7 +177,8 @@ queue_peek(struct libevdev *dev, size_t idx, struct input_event *ev) { if (dev->queue_next == 0 || idx > dev->queue_next) return 1; - *ev = dev->queue[idx]; + raw_input_to_input_event(&dev->queue[idx], ev); + return 0; } @@ -192,7 +193,9 @@ queue_peek(struct libevdev *dev, size_t idx, struct input_event *ev) static inline int queue_shift_multiple(struct libevdev *dev, size_t n, struct input_event *ev) { - size_t remaining; + struct raw_input_event *raw_event; + struct input_event *event; + size_t i, remaining; if (dev->queue_next == 0) return 0; @@ -201,8 +204,16 @@ queue_shift_multiple(struct libevdev *dev, size_t n, struct input_event *ev) n = min(n, remaining); remaining -= n; - if (ev) - memcpy(ev, dev->queue, n * sizeof(*ev)); + raw_event = dev->queue; + event = ev; + + if (ev) { + for (i = 0; i < n; i++) { + raw_input_to_input_event(raw_event, event); + raw_event++; + event++; + } + } memmove(dev->queue, &dev->queue[n], remaining * sizeof(*dev->queue)); @@ -228,7 +239,7 @@ queue_alloc(struct libevdev *dev, size_t size) if (size == 0) return -ENOMEM; - dev->queue = calloc(size, sizeof(struct input_event)); + dev->queue = calloc(size, sizeof(struct raw_input_event)); if (!dev->queue) return -ENOMEM; @@ -266,7 +277,7 @@ queue_num_free_elements(struct libevdev *dev) return dev->queue_size - dev->queue_next; } -static inline struct input_event * +static inline struct raw_input_event * queue_next_element(struct libevdev *dev) { if (dev->queue_next == dev->queue_size) diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index 43a095c..adf351a 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -29,6 +29,7 @@ #include <unistd.h> #include <stdarg.h> #include <stdbool.h> +#include <time.h> #include "libevdev.h" #include "libevdev-int.h" @@ -383,6 +384,10 @@ libevdev_set_fd(struct libevdev* dev, int fd) rc = ioctl(fd, EVIOCGVERSION, &dev->driver_version); if (rc < 0) goto out; + if (dev->driver_version < EV_VERSION_1_2) { + log_error(dev, "Library requires at least kernel driver version 2"); + goto out; + } /* Built on a kernel with props, running against a kernel without property support. This should not be a fatal case, we'll be missing properties but other @@ -522,9 +527,10 @@ libevdev_get_fd(const struct libevdev* dev) } static inline void -init_event(struct libevdev *dev, struct input_event *ev, int type, int code, int value) +init_event(struct libevdev *dev, struct raw_input_event *ev, int type, int code, int value) { - ev->time = dev->last_event_time; + ev->time.tv_sec = dev->last_event_time.tv_sec; + ev->time.tv_usec = dev->last_event_time.tv_usec; ev->type = type; ev->code = code; ev->value = value; @@ -546,7 +552,7 @@ sync_key_state(struct libevdev *dev) old = bit_is_set(dev->key_values, i); new = bit_is_set(keystate, i); if (old ^ new) { - struct input_event *ev = queue_push(dev); + struct raw_input_event *ev = queue_push(dev); init_event(dev, ev, EV_KEY, i, new ? 1 : 0); } } @@ -574,7 +580,7 @@ sync_sw_state(struct libevdev *dev) old = bit_is_set(dev->sw_values, i); new = bit_is_set(swstate, i); if (old ^ new) { - struct input_event *ev = queue_push(dev); + struct raw_input_event *ev = queue_push(dev); init_event(dev, ev, EV_SW, i, new ? 1 : 0); } } @@ -602,7 +608,7 @@ sync_led_state(struct libevdev *dev) old = bit_is_set(dev->led_values, i); new = bit_is_set(ledstate, i); if (old ^ new) { - struct input_event *ev = queue_push(dev); + struct raw_input_event *ev = queue_push(dev); init_event(dev, ev, EV_LED, i, new ? 1 : 0); } } @@ -633,7 +639,7 @@ sync_abs_state(struct libevdev *dev) goto out; if (dev->abs_info[i].value != abs_info.value) { - struct input_event *ev = queue_push(dev); + struct raw_input_event *ev = queue_push(dev); init_event(dev, ev, EV_ABS, i, abs_info.value); dev->abs_info[i].value = abs_info.value; @@ -648,7 +654,7 @@ out: static int sync_mt_state(struct libevdev *dev, int create_events) { - struct input_event *ev; + struct raw_input_event *ev; struct input_absinfo abs_info; int rc; int axis, slot; @@ -775,7 +781,7 @@ read_more_events(struct libevdev *dev) { int free_elem; int len; - struct input_event *next; + struct raw_input_event *next; free_elem = queue_num_free_elements(dev); if (free_elem <= 0) @@ -834,7 +840,7 @@ static int sync_state(struct libevdev *dev) { int rc = 0; - struct input_event *ev; + struct raw_input_event *ev; /* see section "Discarding events before synchronizing" in * libevdev/libevdev.h */ @@ -966,7 +972,8 @@ update_state(struct libevdev *dev, const struct input_event *e) break; } - dev->last_event_time = e->time; + dev->last_event_time.tv_sec = e->time.tv_sec; + dev->last_event_time.tv_usec = e->time.tv_usec; return rc; } @@ -1720,5 +1727,8 @@ libevdev_set_clock_id(struct libevdev *dev, int clockid) } else if (dev->fd < 0) return -EBADF; + if (clockid == CLOCK_REALTIME) + log_info(dev, "REALTIME clock support does not work beyond year 2106.\n"); + return ioctl(dev->fd, EVIOCSCLOCKID, &clockid) ? -errno : 0; } diff --git a/test/test-libevdev-has-event.c b/test/test-libevdev-has-event.c index 7703206..fee11fa 100644 --- a/test/test-libevdev-has-event.c +++ b/test/test-libevdev-has-event.c @@ -475,7 +475,7 @@ START_TEST(test_device_name) ck_assert_int_eq(libevdev_get_id_vendor(dev), ids.vendor); ck_assert_int_eq(libevdev_get_id_product(dev), ids.product); ck_assert_int_eq(libevdev_get_id_version(dev), ids.version); - ck_assert_int_eq(libevdev_get_driver_version(dev), EV_VERSION); + ck_assert_int_eq(libevdev_get_driver_version(dev), EV_VERSION_1_2); uinput_device_free(uidev); libevdev_free(dev); -- 2.7.4

8 years, 6 months

[PATCH] fnic: Use time64_t to represent trace timestamps

by Deepa Dinamani

trace timestamps use struct timespec and CURRENT_TIME which are not y2038 safe. These timestamps are only part of the trace log on the machine and are not shared with the fnic. Replace then with y2038 safe struct timespec64 and ktime_get_real_ts64(), respectively. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> Cc: Hiral Patel <hiralpat(a)cisco.com> Cc: Suma Ramars <sramars(a)cisco.com> Cc: Brian Uchino <buchino(a)cisco.com> Cc: "James E.J. Bottomley" <jejb(a)linux.vnet.ibm.com> Cc: "Martin K. Petersen" <martin.petersen(a)oracle.com> Cc: linux-scsi(a)vger.kernel.org --- drivers/scsi/fnic/fnic_trace.c | 4 ++-- drivers/scsi/fnic/fnic_trace.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index 4e15c4b..5a5fa01 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -613,7 +613,7 @@ int fnic_fc_trace_set_data(u32 host_no, u8 frame_type, fc_trace_entries.rd_idx = 0; } - fc_buf->time_stamp = CURRENT_TIME; + ktime_get_real_ts64(&fc_buf->time_stamp); fc_buf->host_no = host_no; fc_buf->frame_type = frame_type; @@ -740,7 +740,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, len = *orig_len; - time_to_tm(tdata->time_stamp.tv_sec, 0, &tm); + time64_to_tm(tdata->time_stamp.tv_sec, 0, &tm); fmt = "%02d:%02d:%04ld %02d:%02d:%02d.%09lu ns%8x %c%8x\t"; len += snprintf(fnic_dbgfs_prt->buffer + len, diff --git a/drivers/scsi/fnic/fnic_trace.h b/drivers/scsi/fnic/fnic_trace.h index a8aa057..e375d0c 100644 --- a/drivers/scsi/fnic/fnic_trace.h +++ b/drivers/scsi/fnic/fnic_trace.h @@ -72,7 +72,7 @@ struct fnic_trace_data { typedef struct fnic_trace_data fnic_trace_data_t; struct fc_trace_hdr { - struct timespec time_stamp; + struct timespec64 time_stamp; u32 host_no; u8 frame_type; u8 frame_len; -- 2.7.4

8 years, 6 months

Unable to deliver your item, #000884588

by FedEx SmartPost

Dear Customer, This is to confirm that one or more of your parcels has been shipped. Shipment Label is attached to this email. Yours trully, Kurt Richardson, FedEx Delivery Manager.

8 years, 7 months

[PATCH] fs: nfs: Make nfs boot time y2038 safe

by Deepa Dinamani

boot_time is represented as a struct timespec. struct timespec and CURRENT_TIME are not y2038 safe. Overall, the plan is to use timespec64 and ktime_t for all internal kernel representation of timestamps. CURRENT_TIME will also be removed. boot_time is used to construct the nfs client boot verifier. Use ktime_t to represent boot_time and ktime_get_real() for the boot_time value. Following Trond's request https://lkml.org/lkml/2016/6/9/22 , use ktime_t instead of converting to struct timespec64. Use higher and lower 32 bit parts of ktime_t for the boot verifier. Use the lower 32 bit part of ktime_t for the authsys_parms stamp field. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> Cc: Trond Myklebust <trond.myklebust(a)primarydata.com> Cc: Anna Schumaker <anna.schumaker(a)netapp.com> Cc: linux-nfs(a)vger.kernel.org --- fs/nfs/client.c | 2 +- fs/nfs/netns.h | 2 +- fs/nfs/nfs4proc.c | 10 ++++++---- fs/nfs/nfs4xdr.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 1e10678..44d42a4 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -1078,7 +1078,7 @@ void nfs_clients_init(struct net *net) idr_init(&nn->cb_ident_idr); #endif spin_lock_init(&nn->nfs_client_lock); - nn->boot_time = CURRENT_TIME; + nn->boot_time = ktime_get_real(); } #ifdef CONFIG_PROC_FS diff --git a/fs/nfs/netns.h b/fs/nfs/netns.h index f0e06e4..fbce0d8 100644 --- a/fs/nfs/netns.h +++ b/fs/nfs/netns.h @@ -29,7 +29,7 @@ struct nfs_net { int cb_users[NFS4_MAX_MINOR_VERSION + 1]; #endif spinlock_t nfs_client_lock; - struct timespec boot_time; + ktime_t boot_time; #ifdef CONFIG_PROC_FS struct proc_dir_entry *proc_nfsfs; #endif diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index a9dec32..b517cc2 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5123,12 +5123,14 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp, if (test_bit(NFS4CLNT_PURGE_STATE, &clp->cl_state)) { /* An impossible timestamp guarantees this value * will never match a generated boot time. */ - verf[0] = 0; - verf[1] = cpu_to_be32(NSEC_PER_SEC + 1); + verf[0] = cpu_to_be32(U32_MAX); + verf[1] = cpu_to_be32(U32_MAX); } else { struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id); - verf[0] = cpu_to_be32(nn->boot_time.tv_sec); - verf[1] = cpu_to_be32(nn->boot_time.tv_nsec); + u64 ns = ktime_to_ns(nn->boot_time); + + verf[0] = cpu_to_be32(ns >> 32); + verf[1] = cpu_to_be32(ns); } memcpy(bootverf->data, verf, sizeof(bootverf->data)); } diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 7bd3a5c..a961e15 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -1850,7 +1850,7 @@ static void encode_create_session(struct xdr_stream *xdr, *p++ = cpu_to_be32(RPC_AUTH_UNIX); /* auth_sys */ /* authsys_parms rfc1831 */ - *p++ = cpu_to_be32(nn->boot_time.tv_nsec); /* stamp */ + *p++ = cpu_to_be32(ktime_to_ns(nn->boot_time)); /* stamp */ p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen); *p++ = cpu_to_be32(0); /* UID */ *p++ = cpu_to_be32(0); /* GID */ -- 2.7.4

8 years, 7 months

[PATCH] audit: Use timespec64 to represent audit timestamps

by Deepa Dinamani

struct timespec is not y2038 safe. Audit timestamps are recorded in string format into an audit buffer for a given context. These mark the entry timestamps for the syscalls. Use y2038 safe struct timespec64 to represent the times. The log strings can handle this transition as strings can hold upto 1024 characters. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> Acked-by: Paul Moore <paul(a)paul-moore.com> Acked-by: Richard Guy Briggs <rgb(a)redhat.com> Cc: Eric Paris <eparis(a)redhat.com> Cc: Paul Moore <paul(a)paul-moore.com> Cc: Richard Guy Briggs <rgb(a)redhat.com> Cc: linux-audit(a)redhat.com --- include/linux/audit.h | 4 ++-- kernel/audit.c | 10 +++++----- kernel/audit.h | 2 +- kernel/auditsc.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index 9d4443f..e51782b 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -332,7 +332,7 @@ static inline void audit_ptrace(struct task_struct *t) /* Private API (for audit.c only) */ extern unsigned int audit_serial(void); extern int auditsc_get_stamp(struct audit_context *ctx, - struct timespec *t, unsigned int *serial); + struct timespec64 *t, unsigned int *serial); extern int audit_set_loginuid(kuid_t loginuid); static inline kuid_t audit_get_loginuid(struct task_struct *tsk) @@ -490,7 +490,7 @@ static inline void __audit_seccomp(unsigned long syscall, long signr, int code) static inline void audit_seccomp(unsigned long syscall, long signr, int code) { } static inline int auditsc_get_stamp(struct audit_context *ctx, - struct timespec *t, unsigned int *serial) + struct timespec64 *t, unsigned int *serial) { return 0; } diff --git a/kernel/audit.c b/kernel/audit.c index a8a91bd..b03b6c7 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1325,10 +1325,10 @@ unsigned int audit_serial(void) } static inline void audit_get_stamp(struct audit_context *ctx, - struct timespec *t, unsigned int *serial) + struct timespec64 *t, unsigned int *serial) { if (!ctx || !auditsc_get_stamp(ctx, t, serial)) { - *t = CURRENT_TIME; + ktime_get_real_ts64(t); *serial = audit_serial(); } } @@ -1370,7 +1370,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type) { struct audit_buffer *ab = NULL; - struct timespec t; + struct timespec64 t; unsigned int uninitialized_var(serial); int reserve = 5; /* Allow atomic callers to go up to five entries over the normal backlog limit */ @@ -1422,8 +1422,8 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, audit_get_stamp(ab->ctx, &t, &serial); - audit_log_format(ab, "audit(%lu.%03lu:%u): ", - t.tv_sec, t.tv_nsec/1000000, serial); + audit_log_format(ab, "audit(%llu.%03lu:%u): ", + (unsigned long long)t.tv_sec, t.tv_nsec/1000000, serial); return ab; } diff --git a/kernel/audit.h b/kernel/audit.h index 431444c..55d1ca2 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -112,7 +112,7 @@ struct audit_context { enum audit_state state, current_state; unsigned int serial; /* serial number for record */ int major; /* syscall number */ - struct timespec ctime; /* time of syscall entry */ + struct timespec64 ctime; /* time of syscall entry */ unsigned long argv[4]; /* syscall arguments */ long return_code;/* syscall return code */ u64 prio; diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 5abf1dc..8dc7fe9 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1522,7 +1522,7 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2, return; context->serial = 0; - context->ctime = CURRENT_TIME; + ktime_get_real_ts64(&context->ctime); context->in_syscall = 1; context->current_state = state; context->ppid = 0; @@ -1931,13 +1931,13 @@ EXPORT_SYMBOL_GPL(__audit_inode_child); /** * auditsc_get_stamp - get local copies of audit_context values * @ctx: audit_context for the task - * @t: timespec to store time recorded in the audit_context + * @t: timespec64 to store time recorded in the audit_context * @serial: serial value that is recorded in the audit_context * * Also sets the context as auditable. */ int auditsc_get_stamp(struct audit_context *ctx, - struct timespec *t, unsigned int *serial) + struct timespec64 *t, unsigned int *serial) { if (!ctx->in_syscall) return 0; -- 2.7.4

8 years, 7 months

[PATCH] fs: ocfs2: Replace CURRENT_TIME macro

by Deepa Dinamani

CURRENT_TIME is not y2038 safe. Use y2038 safe ktime_get_real_seconds() here for timestamps. struct heartbeat_block's hb_seq and deletetion time are already 64 bits wide and accommodate times beyond y2038. Also use y2038 safe ktime_get_real_ts64() for on disk inode timestamps. These are also wide enough to accommodate time64_t. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> Cc: Joel Becker <jlbec(a)evilplan.org> Cc: ocfs2-devel(a)oss.oracle.com --- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/ocfs2/inode.c | 2 +- fs/ocfs2/namei.c | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 636abcb..9158c98 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c @@ -741,7 +741,7 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg, hb_block = (struct o2hb_disk_heartbeat_block *)slot->ds_raw_block; memset(hb_block, 0, reg->hr_block_bytes); /* TODO: time stuff */ - cputime = CURRENT_TIME.tv_sec; + cputime = ktime_get_real_seconds(); if (!cputime) cputime = 1; diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index c56a767..382401d 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -703,7 +703,7 @@ static int ocfs2_remove_inode(struct inode *inode, goto bail_commit; } - di->i_dtime = cpu_to_le64(CURRENT_TIME.tv_sec); + di->i_dtime = cpu_to_le64(ktime_get_real_seconds()); di->i_flags &= cpu_to_le32(~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL)); ocfs2_journal_dirty(handle, di_bh); diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index a8f1225..e96ed24 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -516,6 +516,7 @@ static int __ocfs2_mknod_locked(struct inode *dir, struct ocfs2_extent_list *fel; u16 feat; struct ocfs2_inode_info *oi = OCFS2_I(inode); + struct timespec64 ts; *new_fe_bh = NULL; @@ -564,10 +565,11 @@ static int __ocfs2_mknod_locked(struct inode *dir, fe->i_last_eb_blk = 0; strcpy(fe->i_signature, OCFS2_INODE_SIGNATURE); fe->i_flags |= cpu_to_le32(OCFS2_VALID_FL); + ktime_get_real_ts64(&ts); fe->i_atime = fe->i_ctime = fe->i_mtime = - cpu_to_le64(CURRENT_TIME.tv_sec); + cpu_to_le64(ts.tv_sec); fe->i_mtime_nsec = fe->i_ctime_nsec = fe->i_atime_nsec = - cpu_to_le32(CURRENT_TIME.tv_nsec); + cpu_to_le32(ts.tv_nsec); fe->i_dtime = 0; /* -- 2.7.4

8 years, 7 months

[PATCH] fs: ocfs2: Use time64_t to represent orphan scan times

by Deepa Dinamani

struct timespec is not y2038 safe. Use time64_t which is y2038 safe to represent orphan scan times. time64_t is sufficient here as only the seconds delta times are relevant. Also use appropriate time functions that return time in time64_t format. Time functions now return monotonic time instead of real time as only delta scan times are relevant and these values are not persistent across reboots. The format string for the debug print is still using long as this is only the time elapsed since the last scan and long is sufficient to represent this value. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> Cc: Mark Fasheh <mfasheh(a)suse.com> Cc: Joel Becker <jlbec(a)evilplan.org> Cc: ocfs2-devel(a)oss.oracle.com --- fs/ocfs2/journal.c | 4 ++-- fs/ocfs2/ocfs2.h | 2 +- fs/ocfs2/super.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index a244f14..d5e5fa7 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -1947,7 +1947,7 @@ static void ocfs2_queue_orphan_scan(struct ocfs2_super *osb) */ seqno++; os->os_count++; - os->os_scantime = CURRENT_TIME; + os->os_scantime = ktime_get_seconds(); unlock: ocfs2_orphan_scan_unlock(osb, seqno); out: @@ -2004,7 +2004,7 @@ void ocfs2_orphan_scan_start(struct ocfs2_super *osb) struct ocfs2_orphan_scan *os; os = &osb->osb_orphan_scan; - os->os_scantime = CURRENT_TIME; + os->os_scantime = ktime_get_seconds(); if (ocfs2_is_hard_readonly(osb) || ocfs2_mount_local(osb)) atomic_set(&os->os_state, ORPHAN_SCAN_INACTIVE); else { diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index e63af7d..7e5958b 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h @@ -224,7 +224,7 @@ struct ocfs2_orphan_scan { struct ocfs2_super *os_osb; struct ocfs2_lock_res os_lockres; /* lock to synchronize scans */ struct delayed_work os_orphan_scan_work; - struct timespec os_scantime; /* time this node ran the scan */ + time64_t os_scantime; /* time this node ran the scan */ u32 os_count; /* tracks node specific scans */ u32 os_seqno; /* tracks cluster wide scans */ atomic_t os_state; /* ACTIVE or INACTIVE */ diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 603b28d..bf3ca30 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -337,7 +337,7 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len) out += snprintf(buf + out, len - out, "Disabled\n"); else out += snprintf(buf + out, len - out, "%lu seconds ago\n", - (get_seconds() - os->os_scantime.tv_sec)); + (unsigned long)(ktime_get_seconds() - os->os_scantime)); out += snprintf(buf + out, len - out, "%10s => %3s %10s\n", "Slots", "Num", "RecoGen"); -- 2.7.4

8 years, 7 months

[PATCH] fs: f2fs: Use ktime_get_real_seconds for sit_info times

by Deepa Dinamani

CURRENT_TIME_SEC is not y2038 safe. Replace use of CURRENT_TIME_SEC with ktime_get_real_seconds in segment timestamps used by GC algorithm including the segment mtime timestamps. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> Cc: Jaegeuk Kim <jaegeuk(a)kernel.org> Cc: Changman Lee <cm224.lee(a)samsung.com> Cc: linux-f2fs-devel(a)lists.sourceforge.net --- fs/f2fs/segment.c | 2 +- fs/f2fs/segment.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index a46296f..34bb30e 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2168,7 +2168,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi) sit_i->dirty_sentries = 0; sit_i->sents_per_block = SIT_ENTRY_PER_BLOCK; sit_i->elapsed_time = le64_to_cpu(sbi->ckpt->elapsed_time); - sit_i->mounted_time = CURRENT_TIME_SEC.tv_sec; + sit_i->mounted_time = ktime_get_real_seconds(); mutex_init(&sit_i->sentry_lock); return 0; } diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index b33f73e..2423749 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -662,8 +662,9 @@ static inline void set_to_next_sit(struct sit_info *sit_i, unsigned int start) static inline unsigned long long get_mtime(struct f2fs_sb_info *sbi) { struct sit_info *sit_i = SIT_I(sbi); - return sit_i->elapsed_time + CURRENT_TIME_SEC.tv_sec - - sit_i->mounted_time; + time64_t now = ktime_get_real_seconds(); + + return sit_i->elapsed_time + now - sit_i->mounted_time; } static inline void set_summary(struct f2fs_summary *sum, nid_t nid, -- 2.7.4

8 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038