Skip to content

Commit 5fb70e7

Browse files
committed
netfs, 9p: Implement helpers for new write code
Implement the helpers for the new write code in 9p. There's now an optional ->prepare_write() that allows the filesystem to set the parameters for the next write, such as maximum size and maximum segment count, and an ->issue_write() that is called to initiate an (asynchronous) write operation. Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> cc: Eric Van Hensbergen <ericvh@kernel.org> cc: Latchesar Ionkov <lucho@ionkov.net> cc: Dominique Martinet <asmadeus@codewreck.org> cc: Christian Schoenebeck <linux_oss@crudebyte.com> cc: v9fs@lists.linux.dev cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org
1 parent ed22e1d commit 5fb70e7

File tree

4 files changed

+100
-0
lines changed

4 files changed

+100
-0
lines changed

fs/9p/vfs_addr.c

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,40 @@
2626
#include "cache.h"
2727
#include "fid.h"
2828

29+
/*
30+
* Writeback calls this when it finds a folio that needs uploading. This isn't
31+
* called if writeback only has copy-to-cache to deal with.
32+
*/
33+
static void v9fs_begin_writeback(struct netfs_io_request *wreq)
34+
{
35+
struct p9_fid *fid;
36+
37+
fid = v9fs_fid_find_inode(wreq->inode, true, INVALID_UID, true);
38+
if (!fid) {
39+
WARN_ONCE(1, "folio expected an open fid inode->i_ino=%lx\n",
40+
wreq->inode->i_ino);
41+
return;
42+
}
43+
44+
wreq->wsize = fid->clnt->msize - P9_IOHDRSZ;
45+
if (fid->iounit)
46+
wreq->wsize = min(wreq->wsize, fid->iounit);
47+
wreq->netfs_priv = fid;
48+
wreq->io_streams[0].avail = true;
49+
}
50+
51+
/*
52+
* Issue a subrequest to write to the server.
53+
*/
54+
static void v9fs_issue_write(struct netfs_io_subrequest *subreq)
55+
{
56+
struct p9_fid *fid = subreq->rreq->netfs_priv;
57+
int err, len;
58+
59+
len = p9_client_write(fid, subreq->start, &subreq->io_iter, &err);
60+
netfs_write_subrequest_terminated(subreq, len ?: err, false);
61+
}
62+
2963
static void v9fs_upload_to_server(struct netfs_io_subrequest *subreq)
3064
{
3165
struct p9_fid *fid = subreq->rreq->netfs_priv;
@@ -92,6 +126,14 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)
92126
rreq->origin == NETFS_UNBUFFERED_WRITE ||
93127
rreq->origin == NETFS_DIO_WRITE);
94128

129+
#if 0 // TODO: Cut over
130+
if (rreq->origin == NETFS_WRITEBACK)
131+
return 0; /* We don't get the write handle until we find we
132+
* have actually dirty data and not just
133+
* copy-to-cache data.
134+
*/
135+
#endif
136+
95137
if (file) {
96138
fid = file->private_data;
97139
if (!fid)
@@ -103,6 +145,10 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)
103145
goto no_fid;
104146
}
105147

148+
rreq->wsize = fid->clnt->msize - P9_IOHDRSZ;
149+
if (fid->iounit)
150+
rreq->wsize = min(rreq->wsize, fid->iounit);
151+
106152
/* we might need to read from a fid that was opened write-only
107153
* for read-modify-write of page cache, use the writeback fid
108154
* for that */
@@ -131,6 +177,8 @@ const struct netfs_request_ops v9fs_req_ops = {
131177
.init_request = v9fs_init_request,
132178
.free_request = v9fs_free_request,
133179
.issue_read = v9fs_issue_read,
180+
.begin_writeback = v9fs_begin_writeback,
181+
.issue_write = v9fs_issue_write,
134182
.create_write_requests = v9fs_create_write_requests,
135183
};
136184

include/net/9p/client.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ int p9_client_read(struct p9_fid *fid, u64 offset, struct iov_iter *to, int *err
207207
int p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to,
208208
int *err);
209209
int p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err);
210+
struct netfs_io_subrequest;
211+
void p9_client_write_subreq(struct netfs_io_subrequest *subreq);
210212
int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset);
211213
int p9dirent_read(struct p9_client *clnt, char *buf, int len,
212214
struct p9_dirent *dirent);

net/9p/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
menuconfig NET_9P
77
tristate "Plan 9 Resource Sharing Support (9P2000)"
8+
select NETFS_SUPPORT
89
help
910
If you say Y here, you will get experimental support for
1011
Plan 9 resource sharing via the 9P2000 protocol.

net/9p/client.c

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <linux/sched/signal.h>
1919
#include <linux/uaccess.h>
2020
#include <linux/uio.h>
21+
#include <linux/netfs.h>
2122
#include <net/9p/9p.h>
2223
#include <linux/parser.h>
2324
#include <linux/seq_file.h>
@@ -1661,6 +1662,54 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err)
16611662
}
16621663
EXPORT_SYMBOL(p9_client_write);
16631664

1665+
void
1666+
p9_client_write_subreq(struct netfs_io_subrequest *subreq)
1667+
{
1668+
struct netfs_io_request *wreq = subreq->rreq;
1669+
struct p9_fid *fid = wreq->netfs_priv;
1670+
struct p9_client *clnt = fid->clnt;
1671+
struct p9_req_t *req;
1672+
unsigned long long start = subreq->start + subreq->transferred;
1673+
int written, len = subreq->len - subreq->transferred;
1674+
int err;
1675+
1676+
p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu len %d\n",
1677+
fid->fid, start, len);
1678+
1679+
/* Don't bother zerocopy for small IO (< 1024) */
1680+
if (clnt->trans_mod->zc_request && len > 1024) {
1681+
req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, &subreq->io_iter,
1682+
0, wreq->len, P9_ZC_HDR_SZ, "dqd",
1683+
fid->fid, start, len);
1684+
} else {
1685+
req = p9_client_rpc(clnt, P9_TWRITE, "dqV", fid->fid,
1686+
start, len, &subreq->io_iter);
1687+
}
1688+
if (IS_ERR(req)) {
1689+
netfs_write_subrequest_terminated(subreq, PTR_ERR(req), false);
1690+
return;
1691+
}
1692+
1693+
err = p9pdu_readf(&req->rc, clnt->proto_version, "d", &written);
1694+
if (err) {
1695+
trace_9p_protocol_dump(clnt, &req->rc);
1696+
p9_req_put(clnt, req);
1697+
netfs_write_subrequest_terminated(subreq, err, false);
1698+
return;
1699+
}
1700+
1701+
if (written > len) {
1702+
pr_err("bogus RWRITE count (%d > %u)\n", written, len);
1703+
written = len;
1704+
}
1705+
1706+
p9_debug(P9_DEBUG_9P, "<<< RWRITE count %d\n", len);
1707+
1708+
p9_req_put(clnt, req);
1709+
netfs_write_subrequest_terminated(subreq, written, false);
1710+
}
1711+
EXPORT_SYMBOL(p9_client_write_subreq);
1712+
16641713
struct p9_wstat *p9_client_stat(struct p9_fid *fid)
16651714
{
16661715
int err;

0 commit comments

Comments
 (0)