Commit 51ffeabe authored by Remi Pommarel's avatar Remi Pommarel Committed by Dominique Martinet
Browse files

9p: Track 9P RPC waiting time as IO 



Use io_wait_event_killable() to ensure that time spent waiting for 9P
RPC transactions is accounted as IO wait time.

Signed-off-by: default avatarRemi Pommarel <repk@triplefau.lt>
Message-ID: <b8601271263011203fa34eada2e8ac21d9f679e5.1769179462.git.repk@triplefau.lt>
Signed-off-by: default avatarDominique Martinet <asmadeus@codewreck.org>
parent ca136b25

net/9p/client.c

+2 −2
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) 
	}

again:

	/* Wait for the response */

	err = wait_event_killable(req->wq,

	err = io_wait_event_killable(req->wq,

				     READ_ONCE(req->status) >= REQ_STATUS_RCVD);



	/* Make sure our req is coherent with regard to updates in other

net/9p/trans_virtio.c

+7 −7
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req) 
		if (err == -ENOSPC) {

			chan->ring_bufs_avail = 0;

			spin_unlock_irqrestore(&chan->lock, flags);

			err = wait_event_killable(*chan->vc_wq,

			err = io_wait_event_killable(*chan->vc_wq,

						     chan->ring_bufs_avail);

			if (err  == -ERESTARTSYS)

				return err;
@@ -325,7 +325,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan, 
		 * Other zc request to finish here

		 */

		if (atomic_read(&vp_pinned) >= chan->p9_max_pages) {

			err = wait_event_killable(vp_wq,

			err = io_wait_event_killable(vp_wq,

			      (atomic_read(&vp_pinned) < chan->p9_max_pages));

			if (err == -ERESTARTSYS)

				return err;
@@ -512,7 +512,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, 
		if (err == -ENOSPC) {

			chan->ring_bufs_avail = 0;

			spin_unlock_irqrestore(&chan->lock, flags);

			err = wait_event_killable(*chan->vc_wq,

			err = io_wait_event_killable(*chan->vc_wq,

						     chan->ring_bufs_avail);

			if (err  == -ERESTARTSYS)

				goto err_out;
@@ -531,7 +531,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, 
	spin_unlock_irqrestore(&chan->lock, flags);

	kicked = 1;

	p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n");

	err = wait_event_killable(req->wq,

	err = io_wait_event_killable(req->wq,

				     READ_ONCE(req->status) >= REQ_STATUS_RCVD);

	// RERROR needs reply (== error string) in static data

	if (READ_ONCE(req->status) == REQ_STATUS_RCVD &&

net/9p/trans_xen.c

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int p9_xen_request(struct p9_client *client, struct p9_req_t *p9_req) 
	ring = &priv->rings[num];



again:

	while (wait_event_killable(ring->wq,

	while (io_wait_event_killable(ring->wq,

				      p9_xen_write_todo(ring, size)) != 0)

		;