Y2038 January 2016

y2038@lists.linaro.org

12 participants
26 discussions

[PATCH 2/6] scsi: bfa: bfa_svc: Remove 'struct timeval'

by Amitoj Kaur Chawla

32 bit systems using 'struct timeval' will break in the year 2038, so we modify the code appropriately. We only need to find the elapsed seconds rather than absolute time, and we only care about full seconds, so it's better to use monotonic times, so using ktime_get_seconds() makes the code more efficient and more robust against a concurrent settimeofday() Since we need monotonic time only, stats_reset_time variable does not need to be changed from u32 to u64 type. After the conversion we get a harmless compiler warning about the possible use of an uninitialised warning. gcc is wrong here and the code is actually ok. Introducing a temporary status_ok variable to store the condition avoids the warning. Signed-off-by: Amitoj Kaur Chawla <amitoj1606(a)gmail.com> --- drivers/scsi/bfa/bfa_svc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c index b3668e9..6521896 100644 --- a/drivers/scsi/bfa/bfa_svc.c +++ b/drivers/scsi/bfa/bfa_svc.c @@ -3081,7 +3081,6 @@ bfa_fcport_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, struct bfa_fcport_s *fcport = BFA_FCPORT_MOD(bfa); struct bfa_port_cfg_s *port_cfg = &fcport->cfg; struct bfa_fcport_ln_s *ln = &fcport->ln; - struct timeval tv; fcport->bfa = bfa; ln->fcport = fcport; @@ -3094,8 +3093,7 @@ bfa_fcport_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, /* * initialize time stamp for stats reset */ - do_gettimeofday(&tv); - fcport->stats_reset_time = tv.tv_sec; + fcport->stats_reset_time = ktime_get_seconds(); fcport->stats_dma_ready = BFA_FALSE; /* @@ -3345,16 +3343,17 @@ __bfa_cb_fcport_stats_get(void *cbarg, bfa_boolean_t complete) struct bfa_cb_pending_q_s *cb; struct list_head *qe, *qen; union bfa_fcport_stats_u *ret; + bool status_ok = (fcport->stats_status == BFA_STATUS_OK); if (complete) { - struct timeval tv; - if (fcport->stats_status == BFA_STATUS_OK) - do_gettimeofday(&tv); + time64_t timestamp; + if (status_ok) + timestamp = ktime_get_seconds(); list_for_each_safe(qe, qen, &fcport->stats_pending_q) { bfa_q_deq(&fcport->stats_pending_q, &qe); cb = (struct bfa_cb_pending_q_s *)qe; - if (fcport->stats_status == BFA_STATUS_OK) { + if (status_ok) { ret = (union bfa_fcport_stats_u *)cb->data; /* Swap FC QoS or FCoE stats */ if (bfa_ioc_get_fcmode(&fcport->bfa->ioc)) @@ -3364,7 +3363,7 @@ __bfa_cb_fcport_stats_get(void *cbarg, bfa_boolean_t complete) bfa_fcport_fcoe_stats_swap(&ret->fcoe, &fcport->stats->fcoe); ret->fcoe.secs_reset = - tv.tv_sec - fcport->stats_reset_time; + timestamp - fcport->stats_reset_time; } } bfa_cb_queue_status(fcport->bfa, &cb->hcb_qe, -- 1.9.1

8 years, 11 months

[PATCH 1/6] scsi: bfa: bfa_svc: Use ktime_get_real_seconds()

by Amitoj Kaur Chawla

32 bit systems using 'struct timeval' will break in the year 2038, so we modify the code appropriately. This patch removes the function bfa_get_log_time() which is only used to get current time in seconds. bfa_get_log_time() is replaced with ktime_get_real_seconds() which returns a 64 bit value. Signed-off-by: Amitoj Kaur Chawla <amitoj1606(a)gmail.com> --- drivers/scsi/bfa/bfa_svc.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c index 625225f..b3668e9 100644 --- a/drivers/scsi/bfa/bfa_svc.c +++ b/drivers/scsi/bfa/bfa_svc.c @@ -15,6 +15,7 @@ * General Public License for more details. */ +#include <linux/ktime.h> #include "bfad_drv.h" #include "bfad_im.h" #include "bfa_plog.h" @@ -303,18 +304,6 @@ plkd_validate_logrec(struct bfa_plog_rec_s *pl_rec) return 0; } -static u64 -bfa_get_log_time(void) -{ - u64 system_time = 0; - struct timeval tv; - do_gettimeofday(&tv); - - /* We are interested in seconds only. */ - system_time = tv.tv_sec; - return system_time; -} - static void bfa_plog_add(struct bfa_plog_s *plog, struct bfa_plog_rec_s *pl_rec) { @@ -335,7 +324,7 @@ bfa_plog_add(struct bfa_plog_s *plog, struct bfa_plog_rec_s *pl_rec) memcpy(pl_recp, pl_rec, sizeof(struct bfa_plog_rec_s)); - pl_recp->tv = bfa_get_log_time(); + pl_recp->tv = ktime_get_real_seconds(); BFA_PL_LOG_REC_INCR(plog->tail); if (plog->head == plog->tail) @@ -6278,7 +6267,7 @@ bfa_fcdiag_lb_is_running(struct bfa_s *bfa) * D-port */ #define bfa_dport_result_start(__dport, __mode) do { \ - (__dport)->result.start_time = bfa_get_log_time(); \ + (__dport)->result.start_time = ktime_get_real_seconds();\ (__dport)->result.status = DPORT_TEST_ST_INPRG; \ (__dport)->result.mode = (__mode); \ (__dport)->result.rp_pwwn = (__dport)->rp_pwwn; \ @@ -6717,7 +6706,7 @@ bfa_dport_scn(struct bfa_dport_s *dport, struct bfi_diag_dport_scn_s *msg) switch (dport->i2hmsg.scn.state) { case BFI_DPORT_SCN_TESTCOMP: - dport->result.end_time = bfa_get_log_time(); + dport->result.end_time = ktime_get_real_seconds(); bfa_trc(dport->bfa, dport->result.end_time); dport->result.status = msg->info.testcomp.status; @@ -6764,7 +6753,7 @@ bfa_dport_scn(struct bfa_dport_s *dport, struct bfi_diag_dport_scn_s *msg) case BFI_DPORT_SCN_SUBTESTSTART: subtesttype = msg->info.teststart.type; dport->result.subtest[subtesttype].start_time = - bfa_get_log_time(); + ktime_get_real_seconds(); dport->result.subtest[subtesttype].status = DPORT_TEST_ST_INPRG; -- 1.9.1

8 years, 11 months

[PATCH 0/6] scsi: bfa: Use y2038 safe timestamps

by Amitoj Kaur Chawla

32 bit systems using 'struct timeval' will break in the year 2038, so these files have been modified appropriately to make them y2038 safe. Amitoj Kaur Chawla (6): scsi: bfa: bfa_svc: Use ktime_get_real_seconds() scsi: bfa: bfa_svc: Remove 'struct timeval' scsi: bfa: Use 'ktime_get_real_seconds()' scsi: bfa: Remove use of time_t scsi: bfa: bfa_port: Remove 'struct timeval' scsi: bfa: bfa_cs: Remove struct timeval drivers/scsi/bfa/bfa_cs.h | 8 +------- drivers/scsi/bfa/bfa_defs_svc.h | 4 ++++ drivers/scsi/bfa/bfa_fcpim.c | 7 ++++--- drivers/scsi/bfa/bfa_fcpim.h | 4 ++-- drivers/scsi/bfa/bfa_port.c | 16 ++++------------ drivers/scsi/bfa/bfa_port.h | 2 +- drivers/scsi/bfa/bfa_svc.c | 36 ++++++++++++------------------------ drivers/scsi/bfa/bfad_bsg.c | 6 +++--- 8 files changed, 31 insertions(+), 52 deletions(-) -- 1.9.1

8 years, 11 months

[PATCH v4 0/3] Convert ppdev to y2038 safe

by Bamvor Jian Zhang

These series of patches try to convert parport device(ppdev) to y2038 safe, and support y2038 safe and unsafe application at the same time. The first two version is here[1][2][3]. An y2038 safe application/kernel use 64bit time_t(aka time64_t) to avoid 32-bit time types broken in the year 2038. Given that some time relative struct(e.g. timeval in ppdev.c) is mainly the offset of the real time, the old 32bit time_t in such application is safe. We need to handle the 32bit time_t and 64bit time_t application at the same time. My approach here is handle them as different ioctl command for different size of timeval. Build successful on arm64, arm and x86_64 with C=1. Changes since v3: 1. Remove the useless compat ioctl in fs/compat_ioctl.c for parport device. Changes since v2: 1. Fix the wrong parameter in copy_to_user. Changes since v1: 1. Fix the warning when build against x86_64. [1] https://lkml.org/lkml/2015/12/9/32 [2] https://lkml.org/lkml/2015/12/17/111 [3] http://www.spinics.net/lists/y2038/msg01059.html Bamvor Jian Zhang (3): ppdev: convert to y2038 safe ppdev: add support for compat ioctl fs/compat: remove useless compat ioctl for parport device drivers/char/ppdev.c | 87 ++++++++++++++++++++++++++++++++++++++++------------ fs/compat_ioctl.c | 22 ------------- 2 files changed, 67 insertions(+), 42 deletions(-) -- 2.1.4

8 years, 11 months

[PATCH v2 0/2] Convert ppdev to y2038 safe

by Bamvor Jian Zhang

These series of patches try to convert parport device(ppdev) to y2038 safe, and support y2038 safe and unsafe application at the same time. The first version is here[1]. An y2038 safe application/kernel use 64bit time_t(aka time64_t) to avoid 32-bit time types broken in the year 2038. Given that some time relative struct(e.g. timeval in ppdev.c) is mainly the offset of the real time, the old 32bit time_t in such application is safe. We need to handle the 32bit time_t and 64bit time_t application at the same time. My approach here is handle them as different ioctl command for different size of timeval. Build successful on arm64, arm and x86_64. Changes since v1: 1. Fix the warning when build against x86_64. [1] https://lkml.org/lkml/2015/12/9/32 Bamvor Jian Zhang (2): ppdev: convert to y2038 safe ppdev: add support for compat ioctl drivers/char/ppdev.c | 87 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 67 insertions(+), 20 deletions(-) -- 2.1.4

8 years, 11 months

Re: [Y2038] [RFC 13/15] kernel: time: change inode_timespec to timespec64

by Deepa Dinamani

On Thu, Jan 07, 2016 at 09:50:30AM +0100, Michael Adam wrote: > Hi, > > the patch contains a conflict resolution artifact.. > Thanks, I've fixed it in my tree now. I will wait to hear other comments before I send an update. -Deepa

8 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038 January 2016