diff options
| author | Simon Derr <simon.derr@bull.net> | 2014-03-10 16:38:51 +0100 |
|---|---|---|
| committer | Eric Van Hensbergen <ericvh@gmail.com> | 2014-03-25 16:38:13 -0500 |
| commit | 931700d26bf17c583805f52121a41231e64868f3 (patch) | |
| tree | ee248fd27429ab8a3736825966a68f4396d929d4 /net/9p | |
| parent | 3f9d5b8dfdc7b013287caaa847b378912b013f77 (diff) | |
| download | linux-stable-931700d26bf17c583805f52121a41231e64868f3.tar.gz linux-stable-931700d26bf17c583805f52121a41231e64868f3.tar.bz2 linux-stable-931700d26bf17c583805f52121a41231e64868f3.zip | |
9pnet_rdma: add cancelled()
Take into account posted recv buffers that will never receive their
reply.
The RDMA code posts a recv buffer for each request that it sends.
When a request is flushed, it is possible that this request will
never receive a reply, and that one recv buffer will stay unused on
the recv queue.
It is then possible, if this scenario happens several times, to have the
recv queue full, and have the 9pnet_rmda module unable to send new requests.
Signed-off-by: Simon Derr <simon.derr@bull.net>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_rdma.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index b374c578ddb8..8f5e4f769d13 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c @@ -587,12 +587,24 @@ static struct p9_trans_rdma *alloc_rdma(struct p9_rdma_opts *opts) return rdma; } -/* its not clear to me we can do anything after send has been posted */ static int rdma_cancel(struct p9_client *client, struct p9_req_t *req) { + /* Nothing to do here. + * We will take care of it (if we have to) in rdma_cancelled() + */ return 1; } +/* A request has been fully flushed without a reply. + * That means we have posted one buffer in excess. + */ +static int rdma_cancelled(struct p9_client *client, struct p9_req_t *req) +{ + struct p9_trans_rdma *rdma = client->trans; + atomic_inc(&rdma->excess_rc); + return 0; +} + /** * trans_create_rdma - Transport method for creating atransport instance * @client: client instance @@ -726,6 +738,7 @@ static struct p9_trans_module p9_rdma_trans = { .close = rdma_close, .request = rdma_request, .cancel = rdma_cancel, + .cancelled = rdma_cancelled, }; /** |