From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Aneesh Kumar K. V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: Re: [RFC-V3 7/7] [net/9p] Handle TREAD/RERROR case in !dotl case.
Date: Fri, 11 Feb 2011 23:40:22 +0530
Message-ID: <87pqqyo31t.fsf@linux.vnet.ibm.com>
References: <1297387511-2697-1-git-send-email-jvrao@linux.vnet.ibm.com> <1297387511-2697-8-git-send-email-jvrao@linux.vnet.ibm.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: linux-fsdevel@vger.kernel.org,
	"Venkateswararao Jujjuri \(JV\)" <jvrao@linux.vnet.ibm.com>
To: "Venkateswararao Jujjuri \(JV\)" <jvrao@linux.vnet.ibm.com>,
	v9fs-developer@lists.sourceforge.net
Return-path: <linux-fsdevel-owner@vger.kernel.org>
Received: from e28smtp01.in.ibm.com ([122.248.162.1]:58372 "EHLO
	e28smtp01.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756321Ab1BKSKa (ORCPT
	<rfc822;linux-fsdevel@vger.kernel.org>);
	Fri, 11 Feb 2011 13:10:30 -0500
Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60])
	by e28smtp01.in.ibm.com (8.14.4/8.13.1) with ESMTP id p1BIARaC002949
	for <linux-fsdevel@vger.kernel.org>; Fri, 11 Feb 2011 23:40:27 +0530
Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63])
	by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p1BIAQGB3059810
	for <linux-fsdevel@vger.kernel.org>; Fri, 11 Feb 2011 23:40:26 +0530
Received: from d28av01.in.ibm.com (loopback [127.0.0.1])
	by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p1BIAQ58019210
	for <linux-fsdevel@vger.kernel.org>; Fri, 11 Feb 2011 23:40:26 +0530
In-Reply-To: <1297387511-2697-8-git-send-email-jvrao@linux.vnet.ibm.com>
Sender: linux-fsdevel-owner@vger.kernel.org
List-ID: <linux-fsdevel.vger.kernel.org>

On Thu, 10 Feb 2011 17:25:11 -0800, "Venkateswararao Jujjuri (JV)" <jvrao@linux.vnet.ibm.com> wrote:
> In addition, this patch also avoids zero copy for short reads in !dotl case.
> 
> Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
> ---
>  net/9p/client.c |   64 +++++++++++++++++++++++++++++++++++-------------------
>  1 files changed, 41 insertions(+), 23 deletions(-)
> 
> diff --git a/net/9p/client.c b/net/9p/client.c
> index f6d8531..3e51273 100644
> --- a/net/9p/client.c
> +++ b/net/9p/client.c
> @@ -443,6 +443,7 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)
>  {
>  	int8_t type;
>  	int err;
> +	int ecode;
> 
>  	err = p9_parse_header(req->rc, NULL, &type, NULL, 0);
>  	if (err) {
> @@ -450,36 +451,53 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)
>  		return err;
>  	}
> 
> -	if (type == P9_RERROR || type == P9_RLERROR) {
> -		int ecode;
> -
> -		if (!p9_is_proto_dotl(c)) {
> -			char *ename;
> +	if (type != P9_RERROR && type != P9_RLERROR)
> +		return 0;
> 
> -			err = p9pdu_readf(req->rc, c->proto_version, "s?d",
> -								&ename, &ecode);
> -			if (err)
> -				goto out_err;
> +	if (!p9_is_proto_dotl(c)) {
> +		char *ename;
> +
> +		if (req->tc->pbuf_size) {
> +			/* Handle user buffers */
> +			size_t len = req->rc->size - req->rc->offset;
> +			if (req->tc->pubuf) {
> +				/* User Buffer */
> +				err = copy_from_user(
> +					&req->rc->sdata[req->rc->offset],
> +					req->tc->pubuf, len);
> +				if (err) {
> +					err = -EFAULT;
> +					return err;
> +				}

Will this handle error resulting from kernel_read ?. I guess we have a
kernel address there.


> +			} else {
> +				/* Kernel Buffer */
> +				memmove(&req->rc->sdata[req->rc->offset],
> +						req->tc->pkbuf, len);
> +			}
> +		}

-aneesh