Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 986cacbd authored by Zoltan Kiss's avatar Zoltan Kiss Committed by Konrad Rzeszutek Wilk
Browse files

xen/blkback: Change statistics counter types to unsigned 



These values shouldn't be negative, but after an overflow their value
can turn into negative, if they are signed. xentop can show bogus
values in this case.

Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
Reported-by: default avatarIchiro Ogino <ichiro.ogino@citrix.co.jp>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 0e367ae4

drivers/block/xen-blkback/blkback.c

+2 −2
Original line number Diff line number Diff line
@@ -381,8 +381,8 @@ irqreturn_t xen_blkif_be_int(int irq, void *dev_id) 


static void print_stats(struct xen_blkif *blkif)

{

	pr_info("xen-blkback (%s): oo %3d  |  rd %4d  |  wr %4d  |  f %4d"

		 "  |  ds %4d\n",

	pr_info("xen-blkback (%s): oo %3llu  |  rd %4llu  |  wr %4llu  |  f %4llu"

		 "  |  ds %4llu\n",

		 current->comm, blkif->st_oo_req,

		 blkif->st_rd_req, blkif->st_wr_req,

		 blkif->st_f_req, blkif->st_ds_req);

drivers/block/xen-blkback/common.h

+7 −7
Original line number Diff line number Diff line
@@ -223,13 +223,13 @@ struct xen_blkif { 


	/* statistics */

	unsigned long		st_print;

	int			st_rd_req;

	int			st_wr_req;

	int			st_oo_req;

	int			st_f_req;

	int			st_ds_req;

	int			st_rd_sect;

	int			st_wr_sect;

	unsigned long long			st_rd_req;

	unsigned long long			st_wr_req;

	unsigned long long			st_oo_req;

	unsigned long long			st_f_req;

	unsigned long long			st_ds_req;

	unsigned long long			st_rd_sect;

	unsigned long long			st_wr_sect;



	wait_queue_head_t	waiting_to_free;

};

drivers/block/xen-blkback/xenbus.c

+7 −7
Original line number Diff line number Diff line
@@ -230,13 +230,13 @@ int __init xen_blkif_interface_init(void) 
	}								\

	static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)



VBD_SHOW(oo_req,  "%d\n", be->blkif->st_oo_req);

VBD_SHOW(rd_req,  "%d\n", be->blkif->st_rd_req);

VBD_SHOW(wr_req,  "%d\n", be->blkif->st_wr_req);

VBD_SHOW(f_req,  "%d\n", be->blkif->st_f_req);

VBD_SHOW(ds_req,  "%d\n", be->blkif->st_ds_req);

VBD_SHOW(rd_sect, "%d\n", be->blkif->st_rd_sect);

VBD_SHOW(wr_sect, "%d\n", be->blkif->st_wr_sect);

VBD_SHOW(oo_req,  "%llu\n", be->blkif->st_oo_req);

VBD_SHOW(rd_req,  "%llu\n", be->blkif->st_rd_req);

VBD_SHOW(wr_req,  "%llu\n", be->blkif->st_wr_req);

VBD_SHOW(f_req,  "%llu\n", be->blkif->st_f_req);

VBD_SHOW(ds_req,  "%llu\n", be->blkif->st_ds_req);

VBD_SHOW(rd_sect, "%llu\n", be->blkif->st_rd_sect);

VBD_SHOW(wr_sect, "%llu\n", be->blkif->st_wr_sect);



static struct attribute *xen_vbdstat_attrs[] = {

	&dev_attr_oo_req.attr,