[PATCH 1/3] [net/9p] Fix the size of receive buffer packing onto VirtIO ring.

[PATCH 1/3] [net/9p] Fix the size of receive buffer packing onto VirtIO ring.

[Venkateswararao Jujjuri (JV)]

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
---
 net/9p/trans_virtio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 244e707..0ec5423 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -367,7 +367,7 @@ req_retry_pinned:
 		in += inp;
 	} else {
 		in = pack_sg_list(chan->sg, out, VIRTQUEUE_NUM, rdata,
-				client->msize);
+				req->rc->capacity);
 	}
 
 	err = virtqueue_add_buf(chan->vq, chan->sg, out, in, req->tc);
-- 
1.7.1

[PATCH 2/3] [net/9p] Fix the msize calculation.

[Venkateswararao Jujjuri (JV)]

msize represents the maximum PDU size that includes P9_IOHDRSZ.

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
---
 net/9p/client.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/9p/client.c b/net/9p/client.c
index 9e3b0e6..1b89351 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -821,8 +821,8 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
 	if (err)
 		goto destroy_fidpool;
 
-	if ((clnt->msize+P9_IOHDRSZ) > clnt->trans_mod->maxsize)
-		clnt->msize = clnt->trans_mod->maxsize-P9_IOHDRSZ;
+	if (clnt->msize > clnt->trans_mod->maxsize)
+		clnt->msize = clnt->trans_mod->maxsize;
 
 	err = p9_client_version(clnt);
 	if (err)
-- 
1.7.1

Re: [PATCH 2/3] [net/9p] Fix the msize calculation.

[Aneesh Kumar K.V]

On Thu, 30 Jun 2011 16:18:40 -0700, "Venkateswararao Jujjuri (JV)" <jvrao@linux.vnet.ibm.com> wrote:
> msize represents the maximum PDU size that includes P9_IOHDRSZ.
> 
> Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
> ---
>  net/9p/client.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/9p/client.c b/net/9p/client.c
> index 9e3b0e6..1b89351 100644
> --- a/net/9p/client.c
> +++ b/net/9p/client.c
> @@ -821,8 +821,8 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
>  	if (err)
>  		goto destroy_fidpool;
> 
> -	if ((clnt->msize+P9_IOHDRSZ) > clnt->trans_mod->maxsize)
> -		clnt->msize = clnt->trans_mod->maxsize-P9_IOHDRSZ;
> +	if (clnt->msize > clnt->trans_mod->maxsize)
> +		clnt->msize = clnt->trans_mod->maxsize;
> 
>  	err = p9_client_version(clnt);
>  	if (err)

Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

-aneesh

[PATCH 3/3] [net/9p] VirtIO can transfer VIRTQUEUE_NUM of pages.

[Venkateswararao Jujjuri (JV)]

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
---
 net/9p/trans_virtio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 0ec5423..175b513 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -592,7 +592,7 @@ static struct p9_trans_module p9_virtio_trans = {
 	.close = p9_virtio_close,
 	.request = p9_virtio_request,
 	.cancel = p9_virtio_cancel,
-	.maxsize = PAGE_SIZE*16,
+	.maxsize = PAGE_SIZE*VIRTQUEUE_NUM,
 	.pref = P9_TRANS_PREF_PAYLOAD_SEP,
 	.def = 0,
 	.owner = THIS_MODULE,
-- 
1.7.1

Re: [PATCH 3/3] [net/9p] VirtIO can transfer VIRTQUEUE_NUM of pages.

[Aneesh Kumar K.V]

On Thu, 30 Jun 2011 16:18:41 -0700, "Venkateswararao Jujjuri (JV)" <jvrao@linux.vnet.ibm.com> wrote:
> Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
> ---
>  net/9p/trans_virtio.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
> index 0ec5423..175b513 100644
> --- a/net/9p/trans_virtio.c
> +++ b/net/9p/trans_virtio.c
> @@ -592,7 +592,7 @@ static struct p9_trans_module p9_virtio_trans = {
>  	.close = p9_virtio_close,
>  	.request = p9_virtio_request,
>  	.cancel = p9_virtio_cancel,
> -	.maxsize = PAGE_SIZE*16,
> +	.maxsize = PAGE_SIZE*VIRTQUEUE_NUM,
>  	.pref = P9_TRANS_PREF_PAYLOAD_SEP,
>  	.def = 0,
>  	.owner = THIS_MODULE,

Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

I guess we also need to make sure Qemu server also set the msize to this
value so that we can operate with large msize ?

-aneesh

Re: [PATCH 3/3] [net/9p] VirtIO can transfer VIRTQUEUE_NUM of pages.

[Venkateswararao Jujjuri]

On 07/01/2011 04:24 AM, Aneesh Kumar K.V wrote:
> On Thu, 30 Jun 2011 16:18:41 -0700, "Venkateswararao Jujjuri (JV)"<jvrao@linux.vnet.ibm.com>  wrote:
>> Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
>> ---
>>   net/9p/trans_virtio.c |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
>> index 0ec5423..175b513 100644
>> --- a/net/9p/trans_virtio.c
>> +++ b/net/9p/trans_virtio.c
>> @@ -592,7 +592,7 @@ static struct p9_trans_module p9_virtio_trans = {
>>   	.close = p9_virtio_close,
>>   	.request = p9_virtio_request,
>>   	.cancel = p9_virtio_cancel,
>> -	.maxsize = PAGE_SIZE*16,
>> +	.maxsize = PAGE_SIZE*VIRTQUEUE_NUM,
>>   	.pref = P9_TRANS_PREF_PAYLOAD_SEP,
>>   	.def = 0,
>>   	.owner = THIS_MODULE,
> Reviewed-by: Aneesh Kumar K.V<aneesh.kumar@linux.vnet.ibm.com>
>
> I guess we also need to make sure Qemu server also set the msize to this
> value so that we can operate with large msize ?
QEMU server acks whatever client requests/sends through TVERSION.
Apart from this we need a broader policy on the whole msize on QEMU
to validate the client's proposal before blindly accepting it.

- JV
> -aneesh

Re: [PATCH 1/3] [net/9p] Fix the size of receive buffer packing onto VirtIO ring.

[Aneesh Kumar K.V]

On Thu, 30 Jun 2011 16:18:39 -0700, "Venkateswararao Jujjuri (JV)" <jvrao@linux.vnet.ibm.com> wrote:
> Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
> ---
>  net/9p/trans_virtio.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
> index 244e707..0ec5423 100644
> --- a/net/9p/trans_virtio.c
> +++ b/net/9p/trans_virtio.c
> @@ -367,7 +367,7 @@ req_retry_pinned:
>  		in += inp;
>  	} else {
>  		in = pack_sg_list(chan->sg, out, VIRTQUEUE_NUM, rdata,
> -				client->msize);
> +				req->rc->capacity);
>  	}
> 
>  	err = virtqueue_add_buf(chan->vq, chan->sg, out, in, req->tc);

So when will req->rc->capacity be different from client->msize ? Can we
get details for that documented in p9_tag_alloc ?

The above pack_sg_list will only be called for non-zero copy case ? In
that case won't client->size be same as rc->capacity ?

-aneesh

Re: [PATCH 1/3] [net/9p] Fix the size of receive buffer packing onto VirtIO ring.

[Venkateswararao Jujjuri]

On 07/01/2011 04:21 AM, Aneesh Kumar K.V wrote:
> On Thu, 30 Jun 2011 16:18:39 -0700, "Venkateswararao Jujjuri (JV)"<jvrao@linux.vnet.ibm.com>  wrote:
>> Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
>> ---
>>   net/9p/trans_virtio.c |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
>> index 244e707..0ec5423 100644
>> --- a/net/9p/trans_virtio.c
>> +++ b/net/9p/trans_virtio.c
>> @@ -367,7 +367,7 @@ req_retry_pinned:
>>   		in += inp;
>>   	} else {
>>   		in = pack_sg_list(chan->sg, out, VIRTQUEUE_NUM, rdata,
>> -				client->msize);
>> +				req->rc->capacity);
>>   	}
>>
>>   	err = virtqueue_add_buf(chan->vq, chan->sg, out, in, req->tc);
> So when will req->rc->capacity be different from client->msize ? Can we
> get details for that documented in p9_tag_alloc ?
>
> The above pack_sg_list will only be called for non-zero copy case ? In
> that case won't client->size be same as rc->capacity ?
you mean client->msize?

Yes this else case is only in the non-zc case.
Basically the client->msize is the maximum pdu size.
say our msize is 128k, and we are doing a TVERSION, the logic
falls into the else case where no ZC is needed. In this case
we are operating with the rc->capacity not the entire msize.

Thanks,
JV
> -aneesh