Commit 55f27e09 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

rbd: record aggregate image transfer count 



Compute the total number of bytes transferred for an image
request--the sum across each of the request's object requests.
To avoid contention do it only when all object requests are
complete, in rbd_img_request_complete().

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent a5a337d4

drivers/block/rbd.c

+18 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ struct rbd_img_request { 
	spinlock_t		completion_lock;/* protects next_completion */

	u32			next_completion;

	rbd_img_callback_t	callback;

	u64			xferred;/* aggregate bytes transferred */

	int			result;	/* first nonzero obj_request result */



	u32			obj_request_count;
@@ -1148,7 +1149,24 @@ static int rbd_obj_request_submit(struct ceph_osd_client *osdc, 


static void rbd_img_request_complete(struct rbd_img_request *img_request)

{



	dout("%s: img %p\n", __func__, img_request);



	/*

	 * If no error occurred, compute the aggregate transfer

	 * count for the image request.  We could instead use

	 * atomic64_cmpxchg() to update it as each object request

	 * completes; not clear which way is better off hand.

	 */

	if (!img_request->result) {

		struct rbd_obj_request *obj_request;

		u64 xferred = 0;



		for_each_obj_request(img_request, obj_request)

			xferred += obj_request->xferred;

		img_request->xferred = xferred;

	}



	if (img_request->callback)

		img_request->callback(img_request);

	else

CRA Git | Maintained and supported by SUSTech CRA and CCSE