From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932595AbcLHU70 (ORCPT ); Thu, 8 Dec 2016 15:59:26 -0500 Received: from mail.kernel.org ([198.145.29.136]:52950 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932303AbcLHU7P (ORCPT ); Thu, 8 Dec 2016 15:59:15 -0500 From: Stefano Stabellini To: v9fs-developer@lists.sourceforge.net Cc: sstabellini@kernel.org, ericvh@gmail.com, rminnich@sandia.gov, lucho@ionkov.net, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] 9p: introduce async write requests Date: Thu, 8 Dec 2016 12:59:06 -0800 Message-Id: <1481230746-16741-5-git-send-email-sstabellini@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1481230746-16741-1-git-send-email-sstabellini@kernel.org> References: <1481230746-16741-1-git-send-email-sstabellini@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the write is an async operation, send a 9p request and return EIOCBQUEUED. Do not wait for completion. Complete the write operation from a callback instead. Signed-off-by: Stefano Stabellini --- net/9p/client.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/net/9p/client.c b/net/9p/client.c index f9f09db..18942b7 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -1719,6 +1719,61 @@ int p9_client_unlinkat(struct p9_fid *dfid, const char *name, int flags) } EXPORT_SYMBOL(p9_client_read); +static void +p9_client_write_complete(struct p9_client *clnt, struct p9_req_t *req, int status) +{ + int err, count; + struct file *file; + struct inode *inode; + unsigned long pg_start, pg_end; + loff_t i_size; + + if (req->status == REQ_STATUS_ERROR) { + p9_debug(P9_DEBUG_ERROR, "req_status error %d\n", req->t_err); + err = req->t_err; + goto out; + } + err = p9_check_errors(clnt, req); + if (err) + goto out; + + err = p9pdu_readf(req->rc, clnt->proto_version, "d", &count); + if (err) { + trace_9p_protocol_dump(clnt, req->rc); + goto out; + } + if (!count) { + p9_debug(P9_DEBUG_ERROR, "count=%d\n", count); + err = 0; + goto out; + } + + p9_debug(P9_DEBUG_9P, "<<< RWRITE count %d\n", count); + + if (count > req->rsize) + count = req->rsize; + + err = count; + file = req->kiocb->ki_filp; + inode = file_inode(file); + pg_start = req->kiocb->ki_pos >> PAGE_SHIFT; + pg_end = (req->kiocb->ki_pos + count - 1) >> PAGE_SHIFT; + + if (inode->i_mapping && inode->i_mapping->nrpages) + invalidate_inode_pages2_range(inode->i_mapping, + pg_start, pg_end); + req->kiocb->ki_pos += count; + i_size = i_size_read(inode); + if (req->kiocb->ki_pos > i_size) { + inode_add_bytes(inode, req->kiocb->ki_pos - i_size); + i_size_write(inode, req->kiocb->ki_pos); + } +out: + req->kiocb->ki_complete(req->kiocb, err, 0); + + p9_free_req(clnt, req); +} + int p9_client_write(struct p9_fid *fid, struct kiocb *iocb, u64 offset, struct iov_iter *from, int *err) @@ -1746,9 +1801,32 @@ int p9_client_unlinkat(struct p9_fid *dfid, const char *name, int flags) req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, from, 0, rsize, P9_ZC_HDR_SZ, "dqd", fid->fid, offset, rsize); - } else { + /* sync request */ + } else if(iocb == NULL || is_sync_kiocb(iocb)) { req = p9_client_rpc(clnt, P9_TWRITE, "dqV", fid->fid, offset, rsize, from); + /* async request */ + } else { + req = p9_client_get_req(clnt, P9_TWRITE, "dqV", fid->fid, + offset, rsize, from); + if (IS_ERR(req)) { + *err = PTR_ERR(req); + break; + } + req->rsize = rsize; + req->kiocb = iocb; + req->callback = p9_client_write_complete; + + *err = clnt->trans_mod->request(clnt, req); + if (*err < 0) { + clnt->status = Disconnected; + p9_free_req(clnt, req); + break; + } + + iov_iter_advance(from, rsize); + *err = -EIOCBQUEUED; + break; } if (IS_ERR(req)) { *err = PTR_ERR(req); -- 1.9.1