shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

libdm: check non-zero io count in _average_{rd,wr}_wait_time (Coverity)

Browse Source 
Although a non-zero value for the number of ticks spent doing IO
should imply a non-zero number of IOs in the interval test for
this explicitly to avoid a divide-by-zero in the event of bad
counter data.
This commit is contained in:
Bryn M. Reeves 2016-07-06 09:20:05 +01:00
parent 03e03e9c11
commit 95ef0cdb46
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libdm/libdm-stats.c
View File

@ -2600,11 +2600,15 @@ static int _average_rd_wait_time(const struct dm_stats *dms, double *await,
rd_io_ticks = dm_stats_get_counter(dms, DM_STATS_READ_NSECS, rd_io_ticks = dm_stats_get_counter(dms, DM_STATS_READ_NSECS,
region_id, area_id); region_id, area_id);
nr_rd_ios = dm_stats_get_counter(dms, DM_STATS_READS_COUNT, nr_rd_ios = dm_stats_get_counter(dms, DM_STATS_READS_COUNT,
region_id, area_id); region_id, area_id);
if (rd_io_ticks > 0) /*
* If rd_io_ticks is > 0 this should imply that nr_rd_ios is
* also > 0 (unless a kernel bug exists). Test for both here
* before using the IO count as a divisor (Coverity).
*/
if (rd_io_ticks > 0 && nr_rd_ios > 0)
*await = (double) rd_io_ticks / (double) nr_rd_ios; *await = (double) rd_io_ticks / (double) nr_rd_ios;
else else
*await = 0.0; *await = 0.0;
@ -2622,7 +2626,12 @@ static int _average_wr_wait_time(const struct dm_stats *dms, double *await,
nr_wr_ios = dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT, nr_wr_ios = dm_stats_get_counter(dms, DM_STATS_WRITES_COUNT,
region_id, area_id); region_id, area_id);
if (wr_io_ticks > 0) /*
* If wr_io_ticks is > 0 this should imply that nr_wr_ios is
* also > 0 (unless a kernel bug exists). Test for both here
* before using the IO count as a divisor (Coverity).
*/
if (wr_io_ticks > 0 && nr_wr_ios > 0)
*await = (double) wr_io_ticks / (double) nr_wr_ios; *await = (double) wr_io_ticks / (double) nr_wr_ios;
else else
*await = 0.0; *await = 0.0;