From: Johannes Thumshirn <jthumshirn@suse.de>
To: "Martin K . Petersen" <martin.petersen@oracle.com>,
James Bottomley <jejb@linux.vnet.ibm.com>
Cc: Hannes Reinecke <hare@suse.de>,
Christoph Hellwig <hch@infradead.org>,
Linux SCSI Mailinglist <linux-scsi@vger.kernel.org>,
Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Bart Van Assche <bart.vanassche@sandisk.com>,
Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH] libfc: fix seconds_since_last_reset miscalculation
Date: Tue, 8 Nov 2016 09:44:54 +0100 [thread overview]
Message-ID: <1478594694-98847-1-git-send-email-jthumshirn@suse.de> (raw)
Commit 540eb1eef 'scsi: libfc: fix seconds_since_last_reset calculation'
removed the use of 'struct timespec' from fc_get_host_stats(). This broke the
output of 'fcoeadm -s' after kernel 4.8-rc1 as lport->boot_time - jiffies
could become negative as in this example:
$ cat /sys/class/fc_host/host8/statistics/seconds_since_last_reset
0x10624dd2f1977b4
Take this into account so
/sys/class/fc_host/hostX/statistics/seconds_since_last_reset is sane again.
Fixes: 540eb1eef ('scsi: libfc: fix seconds_since_last_reset calculation')
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Tested-by: Holger Schranz <holger@fam-schranz.de>
---
drivers/scsi/libfc/fc_lport.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 04ce7cf..475c0a9 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -304,11 +304,15 @@ struct fc_host_statistics *fc_get_host_stats(struct Scsi_Host *shost)
unsigned int cpu;
u64 fcp_in_bytes = 0;
u64 fcp_out_bytes = 0;
+ unsigned long boot_time = lport->boot_time;
fc_stats = &lport->host_stats;
memset(fc_stats, 0, sizeof(struct fc_host_statistics));
- fc_stats->seconds_since_last_reset = (lport->boot_time - jiffies) / HZ;
+ if (boot_time > jiffies)
+ fc_stats->seconds_since_last_reset = (boot_time - jiffies) / HZ;
+ else
+ fc_stats->seconds_since_last_reset = (jiffies - boot_time) / HZ;
for_each_possible_cpu(cpu) {
struct fc_stats *stats;
--
1.8.5.6
next reply other threads:[~2016-11-08 8:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-08 8:44 Johannes Thumshirn [this message]
2016-11-08 15:04 ` [PATCH] libfc: fix seconds_since_last_reset miscalculation Bart Van Assche
2016-11-15 9:18 ` Johannes Thumshirn
2016-11-15 14:50 ` Bart Van Assche
2016-11-15 15:05 ` Johannes Thumshirn
2016-11-16 16:58 ` Arnd Bergmann
2016-11-17 8:12 ` Johannes Thumshirn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1478594694-98847-1-git-send-email-jthumshirn@suse.de \
--to=jthumshirn@suse.de \
--cc=arnd@arndb.de \
--cc=bart.vanassche@sandisk.com \
--cc=hare@suse.de \
--cc=hch@infradead.org \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).