| Message ID | 20240318112542.18863-3-opensource@zhasha.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/4] fs/9p: only translate RWX permissions for plain 9P2000 | expand |
Slowly parsing through these, thanks for the fixes.
This one has a bit of a problem in that we don't have a v9fs specific
drop_inode anymore (either in legacy or .L). The release of the fid should
be handled by v9fs_dir_release in both versions of the protocol.
I had convinced myself we could just use generic_drop_inode because we
decoupled clunking fids from the dentry/inode structures and just handled
them directly in v9fs_dir_release -- so really by recovering the inode
structure every time we were just forcing churn in the inode alloc/dealloc
routines that seemed unnecessary (even in the uncached mode).
Was your concern the performance of the client side lookup of the inode
based on qid or the server side based on fid and can you give me a bit
more information on what you are seeing? Are you not seeing fid clunks
for certain conditions (ie. transient fids, etc.)?
-eric
March 18, 2024 at 6:22 AM, "Joakim Sindholt" <opensource@zhasha.com> wrote:
>
> Signed-off-by: Joakim Sindholt <opensource@zhasha.com>
>
> ---
>
> fs/9p/vfs_super.c | 1 +
>
> 1 file changed, 1 insertion(+)
>
> diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
>
> index 941f7d0e0bfa..23cc67f29af2 100644
>
> --- a/fs/9p/vfs_super.c
>
> +++ b/fs/9p/vfs_super.c
>
> @@ -310,6 +310,7 @@ static const struct super_operations v9fs_super_ops = {
>
> .alloc_inode = v9fs_alloc_inode,
>
> .free_inode = v9fs_free_inode,
>
> .statfs = simple_statfs,
>
> + .drop_inode = v9fs_drop_inode,
>
> .evict_inode = v9fs_evict_inode,
>
> .show_options = v9fs_show_options,
>
> .umount_begin = v9fs_umount_begin,
>
> --
>
> 2.43.2
>
Which server are you testing against? I'm wondering if the underlying problem
might actually be i_nlink being maintained incorrectly by the server which would
lead to inodes lingering since that is the primary way the generic_inode_drop
differentiates. It is possible that we could could add an v9fs_inode_always_drop
in for legacy if the servers weren't reporting i_nlink a compatible fashion
although that might result in never caching legacy 9p2000 (which is probably
what most legacy folks want anyways).
-eric
March 28, 2024 at 10:08 AM, "Eric Van Hensbergen" <eric.vanhensbergen@linux.dev> wrote:
>
> Slowly parsing through these, thanks for the fixes.
>
> This one has a bit of a problem in that we don't have a v9fs specific
>
> drop_inode anymore (either in legacy or .L). The release of the fid should
>
> be handled by v9fs_dir_release in both versions of the protocol.
>
> I had convinced myself we could just use generic_drop_inode because we
>
> decoupled clunking fids from the dentry/inode structures and just handled
>
> them directly in v9fs_dir_release -- so really by recovering the inode
>
> structure every time we were just forcing churn in the inode alloc/dealloc
>
> routines that seemed unnecessary (even in the uncached mode).
>
> Was your concern the performance of the client side lookup of the inode
>
> based on qid or the server side based on fid and can you give me a bit
>
> more information on what you are seeing? Are you not seeing fid clunks
>
> for certain conditions (ie. transient fids, etc.)?
>
> -eric
>
> March 18, 2024 at 6:22 AM, "Joakim Sindholt" <opensource@zhasha.com> wrote:
>
> >
> > Signed-off-by: Joakim Sindholt <opensource@zhasha.com>
> >
> >
> >
> > ---
> >
> >
> >
> > fs/9p/vfs_super.c | 1 +
> >
> >
> >
> > 1 file changed, 1 insertion(+)
> >
> >
> >
> > diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
> >
> >
> >
> > index 941f7d0e0bfa..23cc67f29af2 100644
> >
> >
> >
> > --- a/fs/9p/vfs_super.c
> >
> >
> >
> > +++ b/fs/9p/vfs_super.c
> >
> >
> >
> > @@ -310,6 +310,7 @@ static const struct super_operations v9fs_super_ops = {
> >
> >
> >
> > .alloc_inode = v9fs_alloc_inode,
> >
> >
> >
> > .free_inode = v9fs_free_inode,
> >
> >
> >
> > .statfs = simple_statfs,
> >
> >
> >
> > + .drop_inode = v9fs_drop_inode,
> >
> >
> >
> > .evict_inode = v9fs_evict_inode,
> >
> >
> >
> > .show_options = v9fs_show_options,
> >
> >
> >
> > .umount_begin = v9fs_umount_begin,
> >
> >
> >
> > --
> >
> >
> >
> > 2.43.2
> >
>
On Thu, 28 Mar 2024 15:08:59 +0000, "Eric Van Hensbergen" <eric.vanhensbergen@linux.dev> wrote: > Slowly parsing through these, thanks for the fixes. > This one has a bit of a problem in that we don't have a v9fs specific > drop_inode anymore (either in legacy or .L). The release of the fid should > be handled by v9fs_dir_release in both versions of the protocol. My apologies. I didn't realize that it had been changed in the next branch until after sending it and I haven't had the time to check how it's supposed to work now. > I had convinced myself we could just use generic_drop_inode because we > decoupled clunking fids from the dentry/inode structures and just handled > them directly in v9fs_dir_release -- so really by recovering the inode > structure every time we were just forcing churn in the inode alloc/dealloc > routines that seemed unnecessary (even in the uncached mode). I agree that the alloc followed by immediately dropping it from the cache is a waste of cycles. This was just the most reliable way I knew of fixing it without impacting anything else. > Was your concern the performance of the client side lookup of the inode > based on qid or the server side based on fid and can you give me a bit > more information on what you are seeing? Are you not seeing fid clunks > for certain conditions (ie. transient fids, etc.)? This is what I'm seeing in slabtop on a system with no caching enabled on a 6.1 kernel. I never tested if it persisted on the 6.6 kernel but I assume it would. Active / Total Objects (% used) : 2738808 / 2788118 (98.2%) Active / Total Slabs (% used) : 89853 / 89853 (100.0%) Active / Total Caches (% used) : 164 / 261 (62.8%) Active / Total Size (% used) : 1071558.97K / 1084648.27K (98.8%) Minimum / Average / Maximum Object : 0.02K / 0.39K / 16.01K OBJS ACTIVE USE OBJ SIZE SLABS OBJ/SLAB CACHE SIZE NAME 1235968 1235915 99% 0.06K 19312 64 77248K lsm_inode_cache 1200339 1200339 100% 0.75K 57159 21 914544K v9fs_inode_cache 62136 54815 88% 0.11K 1726 36 6904K buffer_head 49400 45639 92% 0.20K 2600 19 10400K dentry 26368 26364 99% 0.03K 206 128 824K avtab_node 26222 15713 59% 0.57K 1873 14 14984K radix_tree_node 19162 18337 95% 1.20K 1474 13 23584K ext4_inode_cache ... What this is not showing, and it's really rather difficult to show, is that it also causes a large amount of CPU usage on any file operations. I'm not sure if it's simply because the table is enormous or if it's because most of the qids v9fs gets to contend with are identical ones from a whole host of synthetic file systems that it then has to iterate over linearly. The v9fs_inode_cache grows until it takes up all available RAM. And snatching this one from your second mail: > Which server are you testing against? I'm wondering if the underlying problem > might actually be i_nlink being maintained incorrectly by the server which would > lead to inodes lingering since that is the primary way the generic_inode_drop > differentiates. It is possible that we could could add an v9fs_inode_always_drop > in for legacy if the servers weren't reporting i_nlink a compatible fashion > although that might result in never caching legacy 9p2000 (which is probably > what most legacy folks want anyways). I'm running against a regular old 9P2000 server that I wrote myself. No extensions of any kind, so there are no links. I don't really have any objection to the kind of qid.version contextual you implemented in 6.6 and would actually quite like to use it in the near future, but I wouldn't be terribly sad if you removed it either.
Not sure if your sever source is public or not, but it would be useful to test against it and see what I see. It's possible a mismatch with the nlink stat information could indeed cause inodes to stick around even under memory pressure and that'd cause all sorts of problems.
The newer kernel versions have much better qid->inode mapping stuff that should provent some of the weirdness in the implementation before (there were lots of inodes with duplicate ino_num because the way we crushed the allocated inode number with the qid.path) so its definitely worth testing against the latest and greatest if you can. I will try and allocate some time to revive my regressions against 9p2000 and 9p2000.u servers so we catch some of this earlier in the future, but I'm not sure I would have caught any degredation.
-eric
March 28, 2024 at 10:37 AM, "Joakim Sindholt" <opensource@zhasha.com> wrote:
>
> On Thu, 28 Mar 2024 15:08:59 +0000, "Eric Van Hensbergen" <eric.vanhensbergen@linux.dev> wrote:
>
> >
> > Slowly parsing through these, thanks for the fixes.
> >
> > This one has a bit of a problem in that we don't have a v9fs specific
> >
> > drop_inode anymore (either in legacy or .L). The release of the fid should
> >
> > be handled by v9fs_dir_release in both versions of the protocol.
> >
>
> My apologies. I didn't realize that it had been changed in the next
>
> branch until after sending it and I haven't had the time to check how
>
> it's supposed to work now.
>
> >
> > I had convinced myself we could just use generic_drop_inode because we
> >
> > decoupled clunking fids from the dentry/inode structures and just handled
> >
> > them directly in v9fs_dir_release -- so really by recovering the inode
> >
> > structure every time we were just forcing churn in the inode alloc/dealloc
> >
> > routines that seemed unnecessary (even in the uncached mode).
> >
>
> I agree that the alloc followed by immediately dropping it from the
>
> cache is a waste of cycles. This was just the most reliable way I knew
>
> of fixing it without impacting anything else.
>
> >
> > Was your concern the performance of the client side lookup of the inode
> >
> > based on qid or the server side based on fid and can you give me a bit
> >
> > more information on what you are seeing? Are you not seeing fid clunks
> >
> > for certain conditions (ie. transient fids, etc.)?
> >
>
> This is what I'm seeing in slabtop on a system with no caching enabled
>
> on a 6.1 kernel. I never tested if it persisted on the 6.6 kernel but I
>
> assume it would.
>
> Active / Total Objects (% used) : 2738808 / 2788118 (98.2%)
>
> Active / Total Slabs (% used) : 89853 / 89853 (100.0%)
>
> Active / Total Caches (% used) : 164 / 261 (62.8%)
>
> Active / Total Size (% used) : 1071558.97K / 1084648.27K (98.8%)
>
> Minimum / Average / Maximum Object : 0.02K / 0.39K / 16.01K
>
> OBJS ACTIVE USE OBJ SIZE SLABS OBJ/SLAB CACHE SIZE NAME
>
> 1235968 1235915 99% 0.06K 19312 64 77248K lsm_inode_cache
>
> 1200339 1200339 100% 0.75K 57159 21 914544K v9fs_inode_cache
>
> 62136 54815 88% 0.11K 1726 36 6904K buffer_head
>
> 49400 45639 92% 0.20K 2600 19 10400K dentry
>
> 26368 26364 99% 0.03K 206 128 824K avtab_node
>
> 26222 15713 59% 0.57K 1873 14 14984K radix_tree_node
>
> 19162 18337 95% 1.20K 1474 13 23584K ext4_inode_cache
>
> ...
>
> What this is not showing, and it's really rather difficult to show, is
>
> that it also causes a large amount of CPU usage on any file operations.
>
> I'm not sure if it's simply because the table is enormous or if it's
>
> because most of the qids v9fs gets to contend with are identical ones
>
> from a whole host of synthetic file systems that it then has to iterate
>
> over linearly.
>
> The v9fs_inode_cache grows until it takes up all available RAM.
>
> And snatching this one from your second mail:
>
> >
> > Which server are you testing against? I'm wondering if the underlying problem
> >
> > might actually be i_nlink being maintained incorrectly by the server which would
> >
> > lead to inodes lingering since that is the primary way the generic_inode_drop
> >
> > differentiates. It is possible that we could could add an v9fs_inode_always_drop
> >
> > in for legacy if the servers weren't reporting i_nlink a compatible fashion
> >
> > although that might result in never caching legacy 9p2000 (which is probably
> >
> > what most legacy folks want anyways).
> >
>
> I'm running against a regular old 9P2000 server that I wrote myself. No
>
> extensions of any kind, so there are no links. I don't really have any
>
> objection to the kind of qid.version contextual you implemented in 6.6
>
> and would actually quite like to use it in the near future, but I
>
> wouldn't be terribly sad if you removed it either.
>
Also digging a bit deeper -- looks like for legacy we set nlink to 1 always. So server doesn't have anything
to do with that, and it may be a problem in the newer code that we aren't coping properly. I guess I need to compare a legacy trace to a dotL trace and make sure that's right -- a bit worried about how directories show up since they should have 3 nlinks (. and ..) and this code looks generic.
-eric
March 28, 2024 at 2:47 PM, "Eric Van Hensbergen" <eric.vanhensbergen@linux.dev> wrote:
>
> Not sure if your server source is public or not, but it would be useful to test against it and see what I see. It's possible a mismatch with the nlink stat information could indeed cause inodes to stick around even under memory pressure and that'd cause all sorts of problems.
>
> The newer kernel versions have much better qid->inode mapping stuff that should provent some of the weirdness in the implementation before (there were lots of inodes with duplicate ino_num because the way we crushed the allocated inode number with the qid.path) so its definitely worth testing against the latest and greatest if you can. I will try and allocate some time to revive my regressions against 9p2000 and 9p2000.u servers so we catch some of this earlier in the future, but I'm not sure I would have caught any degredation.
>
> -eric
>
> March 28, 2024 at 10:37 AM, "Joakim Sindholt" <opensource@zhasha.com> wrote:
>
> >
> > On Thu, 28 Mar 2024 15:08:59 +0000, "Eric Van Hensbergen" <eric.vanhensbergen@linux.dev> wrote:
> >
> >
> >
> >
> >
> > Slowly parsing through these, thanks for the fixes.
> >
> >
> >
> > This one has a bit of a problem in that we don't have a v9fs specific
> >
> >
> >
> > drop_inode anymore (either in legacy or .L). The release of the fid should
> >
> >
> >
> > be handled by v9fs_dir_release in both versions of the protocol.
> >
> >
> >
> >
> >
> > My apologies. I didn't realize that it had been changed in the next
> >
> >
> >
> > branch until after sending it and I haven't had the time to check how
> >
> >
> >
> > it's supposed to work now.
> >
> >
> >
> >
> >
> > I had convinced myself we could just use generic_drop_inode because we
> >
> >
> >
> > decoupled clunking fids from the dentry/inode structures and just handled
> >
> >
> >
> > them directly in v9fs_dir_release -- so really by recovering the inode
> >
> >
> >
> > structure every time we were just forcing churn in the inode alloc/dealloc
> >
> >
> >
> > routines that seemed unnecessary (even in the uncached mode).
> >
> >
> >
> >
> >
> > I agree that the alloc followed by immediately dropping it from the
> >
> >
> >
> > cache is a waste of cycles. This was just the most reliable way I knew
> >
> >
> >
> > of fixing it without impacting anything else.
> >
> >
> >
> >
> >
> > Was your concern the performance of the client side lookup of the inode
> >
> >
> >
> > based on qid or the server side based on fid and can you give me a bit
> >
> >
> >
> > more information on what you are seeing? Are you not seeing fid clunks
> >
> >
> >
> > for certain conditions (ie. transient fids, etc.)?
> >
> >
> >
> >
> >
> > This is what I'm seeing in slabtop on a system with no caching enabled
> >
> >
> >
> > on a 6.1 kernel. I never tested if it persisted on the 6.6 kernel but I
> >
> >
> >
> > assume it would.
> >
> >
> >
> > Active / Total Objects (% used) : 2738808 / 2788118 (98.2%)
> >
> >
> >
> > Active / Total Slabs (% used) : 89853 / 89853 (100.0%)
> >
> >
> >
> > Active / Total Caches (% used) : 164 / 261 (62.8%)
> >
> >
> >
> > Active / Total Size (% used) : 1071558.97K / 1084648.27K (98.8%)
> >
> >
> >
> > Minimum / Average / Maximum Object : 0.02K / 0.39K / 16.01K
> >
> >
> >
> > OBJS ACTIVE USE OBJ SIZE SLABS OBJ/SLAB CACHE SIZE NAME
> >
> >
> >
> > 1235968 1235915 99% 0.06K 19312 64 77248K lsm_inode_cache
> >
> >
> >
> > 1200339 1200339 100% 0.75K 57159 21 914544K v9fs_inode_cache
> >
> >
> >
> > 62136 54815 88% 0.11K 1726 36 6904K buffer_head
> >
> >
> >
> > 49400 45639 92% 0.20K 2600 19 10400K dentry
> >
> >
> >
> > 26368 26364 99% 0.03K 206 128 824K avtab_node
> >
> >
> >
> > 26222 15713 59% 0.57K 1873 14 14984K radix_tree_node
> >
> >
> >
> > 19162 18337 95% 1.20K 1474 13 23584K ext4_inode_cache
> >
> >
> >
> > ...
> >
> >
> >
> > What this is not showing, and it's really rather difficult to show, is
> >
> >
> >
> > that it also causes a large amount of CPU usage on any file operations.
> >
> >
> >
> > I'm not sure if it's simply because the table is enormous or if it's
> >
> >
> >
> > because most of the qids v9fs gets to contend with are identical ones
> >
> >
> >
> > from a whole host of synthetic file systems that it then has to iterate
> >
> >
> >
> > over linearly.
> >
> >
> >
> > The v9fs_inode_cache grows until it takes up all available RAM.
> >
> >
> >
> > And snatching this one from your second mail:
> >
> >
> >
> >
> >
> > Which server are you testing against? I'm wondering if the underlying problem
> >
> >
> >
> > might actually be i_nlink being maintained incorrectly by the server which would
> >
> >
> >
> > lead to inodes lingering since that is the primary way the generic_inode_drop
> >
> >
> >
> > differentiates. It is possible that we could could add an v9fs_inode_always_drop
> >
> >
> >
> > in for legacy if the servers weren't reporting i_nlink a compatible fashion
> >
> >
> >
> > although that might result in never caching legacy 9p2000 (which is probably
> >
> >
> >
> > what most legacy folks want anyways).
> >
> >
> >
> >
> >
> > I'm running against a regular old 9P2000 server that I wrote myself. No
> >
> >
> >
> > extensions of any kind, so there are no links. I don't really have any
> >
> >
> >
> > objection to the kind of qid.version contextual you implemented in 6.6
> >
> >
> >
> > and would actually quite like to use it in the near future, but I
> >
> >
> >
> > wouldn't be terribly sad if you removed it either.
> >
>
On Thu, 28 Mar 2024 20:03:36 +0000 "Eric Van Hensbergen" <eric.vanhensbergen@linux.dev> wrote: > March 28, 2024 at 2:47 PM, "Eric Van Hensbergen" <eric.vanhensbergen@linux.dev> wrote: > > Not sure if your server source is public or not, but it would be > > useful to test against it and see what I see. It's possible a > > mismatch with the nlink stat information could indeed cause inodes > > to stick around even under memory pressure and that'd cause all > > sorts of problems. It is public but I think it's far more helpful to have a minimal reproducer rather than having you build my 9P library. It took me a little while to get it working and it's not very well written, nor is it particularly small at 540 lines but it does show the issue. > > The newer kernel versions have much better qid->inode mapping stuff > > that should provent some of the weirdness in the implementation > > before (there were lots of inodes with duplicate ino_num because the > > way we crushed the allocated inode number with the qid.path) so its > > definitely worth testing against the latest and greatest if you can. > > I will try and allocate some time to revive my regressions against > > 9p2000 and 9p2000.u servers so we catch some of this earlier in the > > future, but I'm not sure I would have caught any degredation. For now I can't easily test with the latest but I can test with 6.6, which I have done and can confirm it still happens. If you have a test setup then you can run the reproducer. I've attached it at the bottom of this mail. I don't know whether this is a regression. As far as I can tell it's always been a problem. I just didn't notice it because inodes are small and the loads on my file servers were relatively meager. I only noticed it due to a completely unrelated issue on the same machine which sent me down this rabbit hole. The reproducer takes a long time to saturate RAM and even then it doesn't cause OOM since linux does free what it needs to from the cache when it needs to. > Also digging a bit deeper -- looks like for legacy we set nlink to 1 > always. So server doesn't have anything to do with that, and it may > be a problem in the newer code that we aren't coping properly. I > guess I need to compare a legacy trace to a dotL trace and make sure > that's right -- a bit worried about how directories show up since they > should have 3 nlinks (. and ..) and this code looks generic. I don't know if it has anything to do with nlink. The reason I added the .drop_inode callback was because when looking at vfs it seemed to be the one and only way the inodes would ever get explicitly freed from the cache. The reproducer only implements Tversion/attach/walk/open/clunk/stat, so no Tread meaning you never see the stats from reading the directory. The only thing it does is let you walk to a file called "file", stat it, and open it (and stat the root dir as v9fs needs that too). The test program that triggers the issue is literally just: #include <fcntl.h> #include <unistd.h> int main(int argc, char *argv[]) { while (1) close(open("/mnt/test/file", O_RDONLY)); return 0; } As far as I can tell the issue is that open(2) calls Twalk for every path component as well as Tstat after every successful 1-element walk, and the code that calls Tstat puts an inode into the v9fs_inode_cache that doesn't get removed until there's no more RAM to waste. Feel free to play with my ugly test server yourself: #include <unistd.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #include <sys/mount.h> #include <sys/socket.h> typedef struct Req Req; struct Req { uint8_t type; uint16_t tag; uint32_t size; unsigned char *d; }; enum { Msize = 8192, }; enum { Froot = 1, Ffile, Fopen = 0x80, }; static uint8_t fids[32]; static uint32_t iounit; static uint32_t time0; static int infd = 0, outfd = 1; static int debug; #define Filename "file" enum { QTDIR = 0x80, QTFILE = 0, }; #define DMDIR 0x80000000 enum { Tversion = 100, Rversion, Tattach = 104, Rattach, Rerror = 107, Twalk = 110, Rwalk, Topen = 112, Ropen, Tclunk = 120, Rclunk, Tstat = 124, Rstat, }; static void version(Req *); static void attach(Req *); static void walk(Req *); static void open9(Req *); static void clunk(Req *); static void stat9(Req *); static Req *readreq(void); static void respond(unsigned char *); static void err(uint16_t, const char *); static uint32_t r32(unsigned char *); static void w32(unsigned char *, uint32_t); static uint16_t r16(unsigned char *); static void w16(unsigned char *, uint16_t); static size_t wstr(unsigned char *, const char *); static void wqid(unsigned char *, uint8_t, uint32_t, uint64_t); int main(int argc, char *argv[]) { char opts[128], eunsupp[128]; Req *req; int fds[2]; if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) != 0) { perror("socketpair failed"); exit(1); } switch (fork()) { case -1: perror("fork failed"); exit(1); case 0: close(fds[1]); sprintf(opts, "trans=fd,rfdno=%d,wfdno=%d,dfltuid=0,dfltgid=0", fds[0], fds[0]); if (mount("none", "/mnt/test", "9p", 0, opts) != 0) { perror("mount failed"); exit(1); } exit(0); default: close(fds[0]); infd = outfd = fds[1]; break; } while ((req = readreq()) != 0) switch (req->type) { case Tversion: version(req); break; case Tattach: attach(req); break; case Twalk: walk(req); break; case Topen: open9(req); break; case Tclunk: clunk(req); break; case Tstat: stat9(req); break; default: sprintf(eunsupp, "unsupported request %u", req->type); err(req->tag, eunsupp); } return 0; } static void version(Req *req) { uint32_t msize; uint16_t slen; char *version; unsigned char res[4+1+2+4+2+6]; if (req->size < 4+2) { err(req->tag, "invalid Tversion"); return; } msize = r32(&req->d[0]); slen = r16(&req->d[4]); if (req->size-4-2 < slen) { err(req->tag, "invalid Tversion version string"); return; } version = (char *)&req->d[4+2]; version[slen] = 0; if (debug) dprintf(2, "Tversion msize=%u version=%s\n", msize, version); if (msize < 128) { err(req->tag, "msize too small"); return; } if (msize > Msize) msize = Msize; if (strncmp(version, "9P2000", 6) != 0) { err(req->tag, "unsupported version"); return; } if (debug) dprintf(2, "Rversion msize=%u version=9P2000\n", msize); w32(&res[0], sizeof(res)); res[4] = Rversion; w16(&res[4+1], req->tag); w32(&res[4+1+2], msize); wstr(&res[4+1+2+4], "9P2000"); respond(res); iounit = msize-4-1-2-4-8-4; time0 = (uint32_t)time(0); } static void attach(Req *req) { uint32_t fid; unsigned char res[4+1+2+13]; if (req->size < 4) { err(req->tag, "invalid Tattach"); return; } fid = r32(&req->d[0]); if (fid >= sizeof(fids)/sizeof(*fids)) { err(req->tag, "too many fids"); return; } /* ignore afid, uname, aname */ if (debug) dprintf(2, "Tattach fid=%u\n", fid); if (debug) dprintf(2, "Rattach qid=0x%x.%u.%u\n", QTDIR, 0, Froot); w32(&res[0], sizeof(res)); res[4] = Rattach; w16(&res[4+1], req->tag); wqid(&res[4+1+2], QTDIR, 0, Froot); respond(res); fids[fid] = Froot; } static void walk(Req *req) { const char *e; uint32_t fid, newfid; uint16_t nwname, i, j, slen; uint8_t oldfid; char *wname, save; unsigned char res[4+1+2+2+16*13]; if (req->size < 4+4+2) { err(req->tag, "invalid Twalk"); return; } fid = r32(&req->d[0]); if (fid >= sizeof(fids)/sizeof(*fids) || fids[fid] == 0 || (fids[fid]&Fopen)) { err(req->tag, "invalid fid"); return; } newfid = r32(&req->d[4]); if (newfid >= sizeof(fids)/sizeof(*fids)) { err(req->tag, "too many fids"); return; } if (fids[newfid]) { err(req->tag, "invalid newfid"); return; } nwname = r16(&req->d[4+4]); if (nwname > 16) { err(req->tag, "walking too far"); return; } oldfid = fids[newfid]; fids[newfid] = fids[fid]; req->size -= 4+4+2; req->d += 4+4+2; if (debug) fprintf(stderr, "Twalk fid=%u newfid=%u nwname=%u", fid, newfid, nwname); for (i = 0; i < nwname; i++) { if (req->size < 2 || req->size-2 < (slen = r16(&req->d[0]))) { if (debug) { fprintf(stderr, "\n"); fflush(stderr); } err(req->tag, "invalid Twalk wname"); return; } wname = (char *)&req->d[2]; save = wname[slen]; wname[slen] = 0; if (debug) fprintf(stderr, " %s", wname); if (strcmp(wname, Filename) == 0) { if (fids[newfid] != Froot) { e = "file not found"; break; } fids[newfid] = Ffile; wqid(&res[4+1+2+2+(uint32_t)i*13], QTFILE, 0, Ffile); } else if (strcmp(wname, "..") == 0) { fids[newfid] = Froot; wqid(&res[4+1+2+2+(uint32_t)i*13], QTDIR, 0, Froot); } else { e = "file not found"; break; } wname[slen] = save; req->d += 2+slen; req->size -= 2+slen; } if (debug) { fprintf(stderr, "\n"); fflush(stderr); } if (i != nwname) { fids[newfid] = oldfid; if (i == 0) { err(req->tag, e); return; } } if (debug) { fprintf(stderr, "Rwalk"); for (j = 0; j < i; j++) fprintf(stderr, " 0x%x.%u.%u", res[4+1+2+2+j*13+0], r32(&res[4+1+2+2+j*13+1]), r32(&res[4+1+2+2+j*13+1+4])); fprintf(stderr, "\n"); fflush(stderr); } w32(&res[0], 4+1+2+2+(uint32_t)i*13); res[4] = Rwalk; w16(&res[4+1], req->tag); w16(&res[4+1+2], i); respond(res); } static void open9(Req *req) { uint32_t fid; uint8_t mode; unsigned char res[4+1+2+13+4]; if (req->size < 4+1) { err(req->tag, "invalid Topen"); return; } fid = r32(&req->d[0]); if (fid >= sizeof(fids)/sizeof(*fids) || fids[fid] == 0 || (fids[fid]&Fopen)) { err(req->tag, "invalid fid"); return; } mode = req->d[4]; if (debug) dprintf(2, "Topen fid=%u mode=%u\n", fid, mode); if (mode != 0 /*OREAD*/) { err(req->tag, "permission denied"); return; } if (debug) dprintf(2, "Ropen qid=%u.%u.%u iounit=%u\n", fids[fid]==Ffile?QTFILE:QTDIR, 0, fids[fid], iounit); w32(&res[0], sizeof(res)); res[4] = Ropen; w16(&res[4+1], req->tag); wqid(&res[4+1+2], fids[fid]==Ffile?QTFILE:QTDIR, 0, fids[fid]); w32(&res[4+1+2+13], iounit); respond(res); fids[fid] |= Fopen; } static void clunk(Req *req) { uint32_t fid; unsigned char res[4+1+2]; fid = r32(&req->d[0]); if (fid >= sizeof(fids)/sizeof(*fids) || fids[fid] == 0) { err(req->tag, "invalid fid"); return; } if (debug) dprintf(2, "Tclunk fid=%u\n", fid); if (debug) dprintf(2, "Rclunk\n"); w32(&res[0], sizeof(res)); res[4] = Rclunk; w16(&res[4+1], req->tag); respond(res); fids[fid] = 0; } static void stat9(Req *req) { const char *name; uint32_t fid; unsigned char res[1024], *r; fid = r32(&req->d[0]); if (fid >= sizeof(fids)/sizeof(*fids) || fids[fid] == 0) { err(req->tag, "invalid fid"); return; } if (debug) dprintf(2, "Tstat fid=%u\n", fid); res[4] = Rstat; w16(&res[4+1], req->tag); r = &res[4+1+2]; r += 2; /* redundant size */ r += 2; /* size */ w16(r, 0); r += 2; /* type */ w32(r, 0); r += 4; /* dev */ if ((fids[fid]&~Fopen) == Froot) { wqid(r, QTDIR, 0, Froot); r += 13; w32(r, DMDIR|0555); r += 4; name = "/"; } else { wqid(r, QTFILE, 0, Ffile); r += 13; w32(r, 0444); r += 4; name = Filename; } w32(r, time0); r += 4; /* atime */ w32(r, time0); r += 4; /* mtime */ w32(r, 0); w32(r+4, 0); r += 8; /* length */ r += wstr(r, name); r += wstr(r, "someuser"); r += wstr(r, "somegroup"); r += wstr(r, "someotheruser"); if (debug) dprintf(2, "Rstat %s\n", name); w32(&res[0], (uint32_t)(r-res)); w16(&res[4+1+2], (uint16_t)(r-&res[4+1+2+2])); w16(&res[4+1+2+2], (uint16_t)(r-&res[4+1+2+2+2])); respond(res); } static Req * readreq(void) { static unsigned char d[Msize+1]; static Req req; ssize_t r; size_t n; req = (Req){.size = 4}; for (n = 0; n < req.size; n += (size_t)r) { if ((r = read(infd, d+n, req.size-n)) <= 0) break; if (n < 4 && n+(size_t)r >= 4) { req.size = r32(d); if (req.size < 4+1+2) { if (debug) fprintf(stderr, "invalid packet\n"); exit(1); } if (req.size >= sizeof(d)) { if (debug) fprintf(stderr, "packet too large\n"); exit(1); } } } if (n < req.size) { if (n == 0 || r == 0) exit(0); perror("incomplete packet"); exit(1); } req.type = d[4]; req.tag = r16(&d[4+1]); req.d = &d[4+1+2]; req.size -= 4+1+2; return &req; } static void respond(unsigned char *res) { unsigned char *e = res+r32(res); ssize_t r; for (e = res+r32(res); res != e; res += (size_t)r) if ((r = write(outfd, res, (size_t)(e-res))) <= 0) break; if (res != e) { if (r == 0) exit(0); perror("write failed"); exit(1); } } static void err(uint16_t tag, const char *e) { uint16_t len = (uint16_t)strlen(e); unsigned char res[4+1+2+2+len]; if (debug) dprintf(2, "Rerror %s\n", e); w32(&res[0], sizeof(res)); res[4] = Rerror; w16(&res[4+1], tag); w16(&res[4+1+2], len); memcpy(&res[4+1+2+2], e, len); respond(res); } static uint32_t r32(unsigned char *d) { return (uint32_t)d[3]<<24|(uint32_t)d[2]<<16|(uint32_t)d[1]<<8|d[0]; } static void w32(unsigned char *d, uint32_t v) { *d++ = (unsigned char)v; *d++ = (unsigned char)(v>>8); *d++ = (unsigned char)(v>>16); *d++ = (unsigned char)(v>>24); } static uint16_t r16(unsigned char *d) { return (uint16_t)d[1]<<8|d[0]; } static void w16(unsigned char *d, uint16_t v) { *d++ = (unsigned char)v; *d++ = (unsigned char)(v>>8); } static size_t wstr(unsigned char *d, const char *s) { uint16_t len = (uint16_t)strlen(s); w16(&d[0], len); memcpy(&d[2], s, len); return 2+(size_t)len; } static void wqid(unsigned char *d, uint8_t type, uint32_t vers, uint64_t path) { *d++ = type; w32(d, vers); d += 4; *d++ = (unsigned char)path; *d++ = (unsigned char)(path>>8); *d++ = (unsigned char)(path>>16); *d++ = (unsigned char)(path>>24); *d++ = (unsigned char)(path>>32); *d++ = (unsigned char)(path>>40); *d++ = (unsigned char)(path>>48); *d++ = (unsigned char)(path>>56); }
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index 941f7d0e0bfa..23cc67f29af2 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c @@ -310,6 +310,7 @@ static const struct super_operations v9fs_super_ops = { .alloc_inode = v9fs_alloc_inode, .free_inode = v9fs_free_inode, .statfs = simple_statfs, + .drop_inode = v9fs_drop_inode, .evict_inode = v9fs_evict_inode, .show_options = v9fs_show_options, .umount_begin = v9fs_umount_begin,
Signed-off-by: Joakim Sindholt <opensource@zhasha.com> --- fs/9p/vfs_super.c | 1 + 1 file changed, 1 insertion(+)