From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753309AbdKJPhw (ORCPT ); Fri, 10 Nov 2017 10:37:52 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:56196 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753141AbdKJPhs (ORCPT ); Fri, 10 Nov 2017 10:37:48 -0500 From: Arnd Bergmann To: Anil Gurumurthy , Sudarsana Kalluru , "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, y2038@lists.linaro.org, hch@lst.de, hare@suse.com, jthumshirn@suse.de, Arnd Bergmann Subject: [PATCH 5/7] scsi: bfa: replace bfa_get_log_time() with ktime_get_real_seconds() Date: Fri, 10 Nov 2017 16:37:13 +0100 Message-Id: <20171110153715.1929456-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20171110153715.1929456-1-arnd@arndb.de> References: <20171110153715.1929456-1-arnd@arndb.de> X-Provags-ID: V03:K0:rJFCtGg7+A3WsdfWGIvbkZngd3UuBd5eUYz+fENZaj4OhVbCjR3 455IJqNNjDStQBJAfhoPvv04lBib9WFLQJyP4YBtIMU7rpypK9+R8m/SN9wDiTD49hrkZFJ roTRhbPrBrFf//f4urpylmq7ET+hhJsjvqfDcYe6gxu0ea1XnAAGpt7EUz9CL+Hzdut8xx9 +EkWv7xBK1OL2QEo+Z3VA== X-UI-Out-Filterresults: notjunk:1;V01:K0:sZrt4+q72VY=:IwK6eTRRE8MUuar7/8WPF8 ukuvrAZeEi1BXUyrUevnclOichaQL8+dYx381aBjGvzEo8DuFS2Yqjvc09jfcCdvdaNB/+nL6 1zC0hCQDT5ulZ+LYWJAyfW2qhFlPZeEyrnPY+C9NM32VX1gqhhGIFU1+K/0OANmxkfwxAmrLa vJDqqsTPQ97ZJEJSQbgtM7lKfvUPoEZVH5u2lQ5n25nAs6dddEGC52ilUUzkgVQNeAYxEAXPW v+pbDAqM1HeV6xCc/X7bp+cFIQgsZMV4kGQPO7wO/RpFzzwpK138Qg2nJeyKvRawHdb9MLcjB tt+m5FPmBE/Qd8QA+w4J3OI6q7AtSxsL7ovLIp+4bihpnDpPCHWffBDru7QcJiAkckn+NYJV6 wPsG2OmzXIrVc3taThRgK1zf5OT9b2EEoZ/rTnuRw5Vszm9mLMQk04FycWNjPS5r5ws/JwZMV GiFajDeqgzJgnJZ6YJ1ILoSlGFq9VqIUKgl7YtKfw+cfyw72gRkSkqe/BvD/3go3XScdjpLzu IWPUkdCVX4dwWUdRKcJ7JMkkYAkGayDMUTBpQTRrDxSUudu3Jb4ZaF0mRPFfLWCBGDAh315kL 5SG/v0gzUyycQ0Jgjz66Tjb2masClxQuF3CN1HyhDlePTxpS7pEWJoyycZEGnNv76iN+d0RXA uwyFaVqzXhgAchCBQWYk0Fnj3os7RHDW4p1/D0pOi9PTvn21XFDNjhz6kE6K0rniIjMdPDUrV HT0dS9g63cro18u8qzF10ZMcmqO4CsqLXNkSIA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The bfa_get_log_time() returns a 64-bit timestamp that does not suffer from the y2038 overflow on 64-bit systems. However, on 32-bit architectures the timestamp will jump from 0x000000007fffffff to 0xffffffff80000000 in y2038 and produce wrong results. The ktime_get_real_seconds() function does the same thing as bfa_get_log_time() without that problem, so we can simply remove the former use ktime_get_real_seconds() instead. Signed-off-by: Arnd Bergmann --- drivers/scsi/bfa/bfa_svc.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c index dd7d1e6bc2d8..9d20d2c92e8c 100644 --- a/drivers/scsi/bfa/bfa_svc.c +++ b/drivers/scsi/bfa/bfa_svc.c @@ -288,18 +288,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) { @@ -320,7 +308,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) @@ -6141,13 +6129,13 @@ 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.status = DPORT_TEST_ST_INPRG; \ - (__dport)->result.mode = (__mode); \ - (__dport)->result.rp_pwwn = (__dport)->rp_pwwn; \ - (__dport)->result.rp_nwwn = (__dport)->rp_nwwn; \ - (__dport)->result.lpcnt = (__dport)->lpcnt; \ +#define bfa_dport_result_start(__dport, __mode) do { \ + (__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; \ + (__dport)->result.rp_nwwn = (__dport)->rp_nwwn; \ + (__dport)->result.lpcnt = (__dport)->lpcnt; \ } while (0) static bfa_boolean_t bfa_dport_send_req(struct bfa_dport_s *dport, @@ -6581,7 +6569,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; @@ -6628,7 +6616,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; -- 2.9.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH 5/7] scsi: bfa: replace bfa_get_log_time() with ktime_get_real_seconds() Date: Fri, 10 Nov 2017 16:37:13 +0100 Message-ID: <20171110153715.1929456-6-arnd@arndb.de> References: <20171110153715.1929456-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171110153715.1929456-1-arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" To: Anil Gurumurthy , Sudarsana Kalluru , "James E . J . Bottomley" , "Martin K . Petersen" Cc: hare@suse.com, Arnd Bergmann , linux-scsi@vger.kernel.org, y2038@lists.linaro.org, linux-kernel@vger.kernel.org, jthumshirn@suse.de, hch@lst.de List-Id: linux-scsi@vger.kernel.org VGhlIGJmYV9nZXRfbG9nX3RpbWUoKSByZXR1cm5zIGEgNjQtYml0IHRpbWVzdGFtcCB0aGF0IGRv ZXMgbm90CnN1ZmZlciBmcm9tIHRoZSB5MjAzOCBvdmVyZmxvdyBvbiA2NC1iaXQgc3lzdGVtcy4g SG93ZXZlciwgb24gMzItYml0CmFyY2hpdGVjdHVyZXMgdGhlIHRpbWVzdGFtcCB3aWxsIGp1bXAg ZnJvbSAweDAwMDAwMDAwN2ZmZmZmZmYKdG8gMHhmZmZmZmZmZjgwMDAwMDAwIGluIHkyMDM4IGFu ZCBwcm9kdWNlIHdyb25nIHJlc3VsdHMuCgpUaGUga3RpbWVfZ2V0X3JlYWxfc2Vjb25kcygpIGZ1 bmN0aW9uIGRvZXMgdGhlIHNhbWUgdGhpbmcgYXMKYmZhX2dldF9sb2dfdGltZSgpIHdpdGhvdXQg dGhhdCBwcm9ibGVtLCBzbyB3ZSBjYW4gc2ltcGx5IHJlbW92ZQp0aGUgZm9ybWVyIHVzZSBrdGlt ZV9nZXRfcmVhbF9zZWNvbmRzKCkgaW5zdGVhZC4KClNpZ25lZC1vZmYtYnk6IEFybmQgQmVyZ21h bm4gPGFybmRAYXJuZGIuZGU+Ci0tLQogZHJpdmVycy9zY3NpL2JmYS9iZmFfc3ZjLmMgfCAzMiAr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2Vy dGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc2NzaS9iZmEv YmZhX3N2Yy5jIGIvZHJpdmVycy9zY3NpL2JmYS9iZmFfc3ZjLmMKaW5kZXggZGQ3ZDFlNmJjMmQ4 Li45ZDIwZDJjOTJlOGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc2NzaS9iZmEvYmZhX3N2Yy5jCisr KyBiL2RyaXZlcnMvc2NzaS9iZmEvYmZhX3N2Yy5jCkBAIC0yODgsMTggKzI4OCw2IEBAIHBsa2Rf dmFsaWRhdGVfbG9ncmVjKHN0cnVjdCBiZmFfcGxvZ19yZWNfcyAqcGxfcmVjKQogCXJldHVybiAw OwogfQogCi1zdGF0aWMgdTY0Ci1iZmFfZ2V0X2xvZ190aW1lKHZvaWQpCi17Ci0JdTY0IHN5c3Rl bV90aW1lID0gMDsKLQlzdHJ1Y3QgdGltZXZhbCB0djsKLQlkb19nZXR0aW1lb2ZkYXkoJnR2KTsK LQotCS8qIFdlIGFyZSBpbnRlcmVzdGVkIGluIHNlY29uZHMgb25seS4gKi8KLQlzeXN0ZW1fdGlt ZSA9IHR2LnR2X3NlYzsKLQlyZXR1cm4gc3lzdGVtX3RpbWU7Ci19Ci0KIHN0YXRpYyB2b2lkCiBi ZmFfcGxvZ19hZGQoc3RydWN0IGJmYV9wbG9nX3MgKnBsb2csIHN0cnVjdCBiZmFfcGxvZ19yZWNf cyAqcGxfcmVjKQogewpAQCAtMzIwLDcgKzMwOCw3IEBAIGJmYV9wbG9nX2FkZChzdHJ1Y3QgYmZh X3Bsb2dfcyAqcGxvZywgc3RydWN0IGJmYV9wbG9nX3JlY19zICpwbF9yZWMpCiAKIAltZW1jcHko cGxfcmVjcCwgcGxfcmVjLCBzaXplb2Yoc3RydWN0IGJmYV9wbG9nX3JlY19zKSk7CiAKLQlwbF9y ZWNwLT50diA9IGJmYV9nZXRfbG9nX3RpbWUoKTsKKwlwbF9yZWNwLT50diA9IGt0aW1lX2dldF9y ZWFsX3NlY29uZHMoKTsKIAlCRkFfUExfTE9HX1JFQ19JTkNSKHBsb2ctPnRhaWwpOwogCiAJaWYg KHBsb2ctPmhlYWQgPT0gcGxvZy0+dGFpbCkKQEAgLTYxNDEsMTMgKzYxMjksMTMgQEAgYmZhX2Zj ZGlhZ19sYl9pc19ydW5uaW5nKHN0cnVjdCBiZmFfcyAqYmZhKQogLyoKICAqCUQtcG9ydAogICov Ci0jZGVmaW5lIGJmYV9kcG9ydF9yZXN1bHRfc3RhcnQoX19kcG9ydCwgX19tb2RlKSBkbyB7CQkJ XAotCQkoX19kcG9ydCktPnJlc3VsdC5zdGFydF90aW1lID0gYmZhX2dldF9sb2dfdGltZSgpOwlc Ci0JCShfX2Rwb3J0KS0+cmVzdWx0LnN0YXR1cyA9IERQT1JUX1RFU1RfU1RfSU5QUkc7CQlcCi0J CShfX2Rwb3J0KS0+cmVzdWx0Lm1vZGUgPSAoX19tb2RlKTsJCQlcCi0JCShfX2Rwb3J0KS0+cmVz dWx0LnJwX3B3d24gPSAoX19kcG9ydCktPnJwX3B3d247CQlcCi0JCShfX2Rwb3J0KS0+cmVzdWx0 LnJwX253d24gPSAoX19kcG9ydCktPnJwX253d247CQlcCi0JCShfX2Rwb3J0KS0+cmVzdWx0Lmxw Y250ID0gKF9fZHBvcnQpLT5scGNudDsJCVwKKyNkZWZpbmUgYmZhX2Rwb3J0X3Jlc3VsdF9zdGFy dChfX2Rwb3J0LCBfX21vZGUpIGRvIHsJCQkJXAorCQkoX19kcG9ydCktPnJlc3VsdC5zdGFydF90 aW1lID0ga3RpbWVfZ2V0X3JlYWxfc2Vjb25kcygpOwlcCisJCShfX2Rwb3J0KS0+cmVzdWx0LnN0 YXR1cyA9IERQT1JUX1RFU1RfU1RfSU5QUkc7CQkJXAorCQkoX19kcG9ydCktPnJlc3VsdC5tb2Rl ID0gKF9fbW9kZSk7CQkJCVwKKwkJKF9fZHBvcnQpLT5yZXN1bHQucnBfcHd3biA9IChfX2Rwb3J0 KS0+cnBfcHd3bjsJCQlcCisJCShfX2Rwb3J0KS0+cmVzdWx0LnJwX253d24gPSAoX19kcG9ydCkt PnJwX253d247CQkJXAorCQkoX19kcG9ydCktPnJlc3VsdC5scGNudCA9IChfX2Rwb3J0KS0+bHBj bnQ7CQkJXAogfSB3aGlsZSAoMCkKIAogc3RhdGljIGJmYV9ib29sZWFuX3QgYmZhX2Rwb3J0X3Nl bmRfcmVxKHN0cnVjdCBiZmFfZHBvcnRfcyAqZHBvcnQsCkBAIC02NTgxLDcgKzY1NjksNyBAQCBi ZmFfZHBvcnRfc2NuKHN0cnVjdCBiZmFfZHBvcnRfcyAqZHBvcnQsIHN0cnVjdCBiZmlfZGlhZ19k cG9ydF9zY25fcyAqbXNnKQogCiAJc3dpdGNoIChkcG9ydC0+aTJobXNnLnNjbi5zdGF0ZSkgewog CWNhc2UgQkZJX0RQT1JUX1NDTl9URVNUQ09NUDoKLQkJZHBvcnQtPnJlc3VsdC5lbmRfdGltZSA9 IGJmYV9nZXRfbG9nX3RpbWUoKTsKKwkJZHBvcnQtPnJlc3VsdC5lbmRfdGltZSA9IGt0aW1lX2dl dF9yZWFsX3NlY29uZHMoKTsKIAkJYmZhX3RyYyhkcG9ydC0+YmZhLCBkcG9ydC0+cmVzdWx0LmVu ZF90aW1lKTsKIAogCQlkcG9ydC0+cmVzdWx0LnN0YXR1cyA9IG1zZy0+aW5mby50ZXN0Y29tcC5z dGF0dXM7CkBAIC02NjI4LDcgKzY2MTYsNyBAQCBiZmFfZHBvcnRfc2NuKHN0cnVjdCBiZmFfZHBv cnRfcyAqZHBvcnQsIHN0cnVjdCBiZmlfZGlhZ19kcG9ydF9zY25fcyAqbXNnKQogCWNhc2UgQkZJ X0RQT1JUX1NDTl9TVUJURVNUU1RBUlQ6CiAJCXN1YnRlc3R0eXBlID0gbXNnLT5pbmZvLnRlc3Rz dGFydC50eXBlOwogCQlkcG9ydC0+cmVzdWx0LnN1YnRlc3Rbc3VidGVzdHR5cGVdLnN0YXJ0X3Rp bWUgPQotCQkJYmZhX2dldF9sb2dfdGltZSgpOworCQkJa3RpbWVfZ2V0X3JlYWxfc2Vjb25kcygp OwogCQlkcG9ydC0+cmVzdWx0LnN1YnRlc3Rbc3VidGVzdHR5cGVdLnN0YXR1cyA9CiAJCQlEUE9S VF9URVNUX1NUX0lOUFJHOwogCi0tIAoyLjkuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KWTIwMzggbWFpbGluZyBsaXN0ClkyMDM4QGxpc3RzLmxpbmFy by5vcmcKaHR0cHM6Ly9saXN0cy5saW5hcm8ub3JnL21haWxtYW4vbGlzdGluZm8veTIwMzgK