Commit 5bdade66 authored by Greg Kurz's avatar Greg Kurz
Browse files

9pfs: use coroutine_fn annotation in hw/9pfs/co*.[ch] 



All these functions use the v9fs_co_run_in_worker() macro, and thus always
call qemu_coroutine_self() and qemu_coroutine_yield().

Let's mark them to make it obvious they execute in coroutine context.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
parent bc70a592

hw/9pfs/codir.c

+10 −7
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#include "qemu/coroutine.h"

#include "coth.h"



int v9fs_co_readdir(V9fsPDU *pdu, V9fsFidState *fidp, struct dirent **dent)

int coroutine_fn v9fs_co_readdir(V9fsPDU *pdu, V9fsFidState *fidp,

                                 struct dirent **dent)

{

    int err;

    V9fsState *s = pdu->s;
@@ -59,7 +60,8 @@ off_t v9fs_co_telldir(V9fsPDU *pdu, V9fsFidState *fidp) 
    return err;

}



void v9fs_co_seekdir(V9fsPDU *pdu, V9fsFidState *fidp, off_t offset)

void coroutine_fn v9fs_co_seekdir(V9fsPDU *pdu, V9fsFidState *fidp,

                                  off_t offset)

{

    V9fsState *s = pdu->s;

    if (v9fs_request_cancelled(pdu)) {
@@ -71,7 +73,7 @@ void v9fs_co_seekdir(V9fsPDU *pdu, V9fsFidState *fidp, off_t offset) 
        });

}



void v9fs_co_rewinddir(V9fsPDU *pdu, V9fsFidState *fidp)

void coroutine_fn v9fs_co_rewinddir(V9fsPDU *pdu, V9fsFidState *fidp)

{

    V9fsState *s = pdu->s;

    if (v9fs_request_cancelled(pdu)) {
@@ -83,8 +85,9 @@ void v9fs_co_rewinddir(V9fsPDU *pdu, V9fsFidState *fidp) 
        });

}



int v9fs_co_mkdir(V9fsPDU *pdu, V9fsFidState *fidp, V9fsString *name,

                  mode_t mode, uid_t uid, gid_t gid, struct stat *stbuf)

int coroutine_fn v9fs_co_mkdir(V9fsPDU *pdu, V9fsFidState *fidp,

                               V9fsString *name, mode_t mode, uid_t uid,

                               gid_t gid, struct stat *stbuf)

{

    int err;

    FsCred cred;
@@ -120,7 +123,7 @@ int v9fs_co_mkdir(V9fsPDU *pdu, V9fsFidState *fidp, V9fsString *name, 
    return err;

}



int v9fs_co_opendir(V9fsPDU *pdu, V9fsFidState *fidp)

int coroutine_fn v9fs_co_opendir(V9fsPDU *pdu, V9fsFidState *fidp)

{

    int err;

    V9fsState *s = pdu->s;
@@ -148,7 +151,7 @@ int v9fs_co_opendir(V9fsPDU *pdu, V9fsFidState *fidp) 
    return err;

}



int v9fs_co_closedir(V9fsPDU *pdu, V9fsFidOpenState *fs)

int coroutine_fn v9fs_co_closedir(V9fsPDU *pdu, V9fsFidOpenState *fs)

{

    int err;

    V9fsState *s = pdu->s;

hw/9pfs/cofile.c

+17 −15
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "qemu/coroutine.h"

#include "coth.h"



int v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t st_mode,

int coroutine_fn v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t st_mode,

                                V9fsStatDotl *v9stat)

{

    int err = 0;
@@ -41,7 +41,7 @@ int v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t st_mode, 
    return err;

}



int v9fs_co_lstat(V9fsPDU *pdu, V9fsPath *path, struct stat *stbuf)

int coroutine_fn v9fs_co_lstat(V9fsPDU *pdu, V9fsPath *path, struct stat *stbuf)

{

    int err;

    V9fsState *s = pdu->s;
@@ -61,7 +61,8 @@ int v9fs_co_lstat(V9fsPDU *pdu, V9fsPath *path, struct stat *stbuf) 
    return err;

}



int v9fs_co_fstat(V9fsPDU *pdu, V9fsFidState *fidp, struct stat *stbuf)

int coroutine_fn v9fs_co_fstat(V9fsPDU *pdu, V9fsFidState *fidp,

                               struct stat *stbuf)

{

    int err;

    V9fsState *s = pdu->s;
@@ -93,7 +94,7 @@ int v9fs_co_fstat(V9fsPDU *pdu, V9fsFidState *fidp, struct stat *stbuf) 
    return err;

}



int v9fs_co_open(V9fsPDU *pdu, V9fsFidState *fidp, int flags)

int coroutine_fn v9fs_co_open(V9fsPDU *pdu, V9fsFidState *fidp, int flags)

{

    int err;

    V9fsState *s = pdu->s;
@@ -121,8 +122,9 @@ int v9fs_co_open(V9fsPDU *pdu, V9fsFidState *fidp, int flags) 
    return err;

}



int v9fs_co_open2(V9fsPDU *pdu, V9fsFidState *fidp, V9fsString *name, gid_t gid,

                  int flags, int mode, struct stat *stbuf)

int coroutine_fn v9fs_co_open2(V9fsPDU *pdu, V9fsFidState *fidp,

                               V9fsString *name, gid_t gid, int flags, int mode,

                               struct stat *stbuf)

{

    int err;

    FsCred cred;
@@ -175,7 +177,7 @@ int v9fs_co_open2(V9fsPDU *pdu, V9fsFidState *fidp, V9fsString *name, gid_t gid, 
    return err;

}



int v9fs_co_close(V9fsPDU *pdu, V9fsFidOpenState *fs)

int coroutine_fn v9fs_co_close(V9fsPDU *pdu, V9fsFidOpenState *fs)

{

    int err;

    V9fsState *s = pdu->s;
@@ -196,7 +198,7 @@ int v9fs_co_close(V9fsPDU *pdu, V9fsFidOpenState *fs) 
    return err;

}



int v9fs_co_fsync(V9fsPDU *pdu, V9fsFidState *fidp, int datasync)

int coroutine_fn v9fs_co_fsync(V9fsPDU *pdu, V9fsFidState *fidp, int datasync)

{

    int err;

    V9fsState *s = pdu->s;
@@ -214,7 +216,7 @@ int v9fs_co_fsync(V9fsPDU *pdu, V9fsFidState *fidp, int datasync) 
    return err;

}



int v9fs_co_link(V9fsPDU *pdu, V9fsFidState *oldfid,

int coroutine_fn v9fs_co_link(V9fsPDU *pdu, V9fsFidState *oldfid,

                              V9fsFidState *newdirfid, V9fsString *name)

{

    int err;
@@ -236,7 +238,7 @@ int v9fs_co_link(V9fsPDU *pdu, V9fsFidState *oldfid, 
    return err;

}



int v9fs_co_pwritev(V9fsPDU *pdu, V9fsFidState *fidp,

int coroutine_fn v9fs_co_pwritev(V9fsPDU *pdu, V9fsFidState *fidp,

                                 struct iovec *iov, int iovcnt, int64_t offset)

{

    int err;
@@ -255,7 +257,7 @@ int v9fs_co_pwritev(V9fsPDU *pdu, V9fsFidState *fidp, 
    return err;

}



int v9fs_co_preadv(V9fsPDU *pdu, V9fsFidState *fidp,

int coroutine_fn v9fs_co_preadv(V9fsPDU *pdu, V9fsFidState *fidp,

                                struct iovec *iov, int iovcnt, int64_t offset)

{

    int err;

hw/9pfs/cofs.c

+25 −18
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static ssize_t __readlink(V9fsState *s, V9fsPath *path, V9fsString *buf) 
    return len;

}



int v9fs_co_readlink(V9fsPDU *pdu, V9fsPath *path, V9fsString *buf)

int coroutine_fn v9fs_co_readlink(V9fsPDU *pdu, V9fsPath *path, V9fsString *buf)

{

    int err;

    V9fsState *s = pdu->s;
@@ -69,7 +69,8 @@ int v9fs_co_readlink(V9fsPDU *pdu, V9fsPath *path, V9fsString *buf) 
    return err;

}



int v9fs_co_statfs(V9fsPDU *pdu, V9fsPath *path, struct statfs *stbuf)

int coroutine_fn v9fs_co_statfs(V9fsPDU *pdu, V9fsPath *path,

                                struct statfs *stbuf)

{

    int err;

    V9fsState *s = pdu->s;
@@ -89,7 +90,7 @@ int v9fs_co_statfs(V9fsPDU *pdu, V9fsPath *path, struct statfs *stbuf) 
    return err;

}



int v9fs_co_chmod(V9fsPDU *pdu, V9fsPath *path, mode_t mode)

int coroutine_fn v9fs_co_chmod(V9fsPDU *pdu, V9fsPath *path, mode_t mode)

{

    int err;

    FsCred cred;
@@ -112,7 +113,7 @@ int v9fs_co_chmod(V9fsPDU *pdu, V9fsPath *path, mode_t mode) 
    return err;

}



int v9fs_co_utimensat(V9fsPDU *pdu, V9fsPath *path,

int coroutine_fn v9fs_co_utimensat(V9fsPDU *pdu, V9fsPath *path,

                                   struct timespec times[2])

{

    int err;
@@ -133,7 +134,8 @@ int v9fs_co_utimensat(V9fsPDU *pdu, V9fsPath *path, 
    return err;

}



int v9fs_co_chown(V9fsPDU *pdu, V9fsPath *path, uid_t uid, gid_t gid)

int coroutine_fn v9fs_co_chown(V9fsPDU *pdu, V9fsPath *path, uid_t uid,

                               gid_t gid)

{

    int err;

    FsCred cred;
@@ -157,7 +159,7 @@ int v9fs_co_chown(V9fsPDU *pdu, V9fsPath *path, uid_t uid, gid_t gid) 
    return err;

}



int v9fs_co_truncate(V9fsPDU *pdu, V9fsPath *path, off_t size)

int coroutine_fn v9fs_co_truncate(V9fsPDU *pdu, V9fsPath *path, off_t size)

{

    int err;

    V9fsState *s = pdu->s;
@@ -177,8 +179,9 @@ int v9fs_co_truncate(V9fsPDU *pdu, V9fsPath *path, off_t size) 
    return err;

}



int v9fs_co_mknod(V9fsPDU *pdu, V9fsFidState *fidp, V9fsString *name, uid_t uid,

                  gid_t gid, dev_t dev, mode_t mode, struct stat *stbuf)

int coroutine_fn v9fs_co_mknod(V9fsPDU *pdu, V9fsFidState *fidp,

                               V9fsString *name, uid_t uid, gid_t gid,

                               dev_t dev, mode_t mode, struct stat *stbuf)

{

    int err;

    V9fsPath path;
@@ -216,7 +219,7 @@ int v9fs_co_mknod(V9fsPDU *pdu, V9fsFidState *fidp, V9fsString *name, uid_t uid, 
}



/* Only works with path name based fid */

int v9fs_co_remove(V9fsPDU *pdu, V9fsPath *path)

int coroutine_fn v9fs_co_remove(V9fsPDU *pdu, V9fsPath *path)

{

    int err;

    V9fsState *s = pdu->s;
@@ -236,7 +239,8 @@ int v9fs_co_remove(V9fsPDU *pdu, V9fsPath *path) 
    return err;

}



int v9fs_co_unlinkat(V9fsPDU *pdu, V9fsPath *path, V9fsString *name, int flags)

int coroutine_fn v9fs_co_unlinkat(V9fsPDU *pdu, V9fsPath *path,

                                  V9fsString *name, int flags)

{

    int err;

    V9fsState *s = pdu->s;
@@ -257,7 +261,8 @@ int v9fs_co_unlinkat(V9fsPDU *pdu, V9fsPath *path, V9fsString *name, int flags) 
}



/* Only work with path name based fid */

int v9fs_co_rename(V9fsPDU *pdu, V9fsPath *oldpath, V9fsPath *newpath)

int coroutine_fn v9fs_co_rename(V9fsPDU *pdu, V9fsPath *oldpath,

                                V9fsPath *newpath)

{

    int err;

    V9fsState *s = pdu->s;
@@ -275,8 +280,9 @@ int v9fs_co_rename(V9fsPDU *pdu, V9fsPath *oldpath, V9fsPath *newpath) 
    return err;

}



int v9fs_co_renameat(V9fsPDU *pdu, V9fsPath *olddirpath, V9fsString *oldname,

                     V9fsPath *newdirpath, V9fsString *newname)

int coroutine_fn v9fs_co_renameat(V9fsPDU *pdu, V9fsPath *olddirpath,

                                  V9fsString *oldname, V9fsPath *newdirpath,

                                  V9fsString *newname)

{

    int err;

    V9fsState *s = pdu->s;
@@ -295,8 +301,9 @@ int v9fs_co_renameat(V9fsPDU *pdu, V9fsPath *olddirpath, V9fsString *oldname, 
    return err;

}



int v9fs_co_symlink(V9fsPDU *pdu, V9fsFidState *dfidp, V9fsString *name,

                    const char *oldpath, gid_t gid, struct stat *stbuf)

int coroutine_fn v9fs_co_symlink(V9fsPDU *pdu, V9fsFidState *dfidp,

                                 V9fsString *name, const char *oldpath,

                                 gid_t gid, struct stat *stbuf)

{

    int err;

    FsCred cred;
@@ -337,7 +344,7 @@ int v9fs_co_symlink(V9fsPDU *pdu, V9fsFidState *dfidp, V9fsString *name, 
 * For path name based fid we don't block. So we can

 * directly call the fs driver ops.

 */

int v9fs_co_name_to_path(V9fsPDU *pdu, V9fsPath *dirpath,

int coroutine_fn v9fs_co_name_to_path(V9fsPDU *pdu, V9fsPath *dirpath,

                                      const char *name, V9fsPath *path)

{

    int err;

hw/9pfs/coth.h

+47 −46
Original line number Diff line number Diff line
@@ -48,51 +48,52 @@ 
    } while (0)



void co_run_in_worker_bh(void *);

int v9fs_co_readlink(V9fsPDU *, V9fsPath *, V9fsString *);

int v9fs_co_readdir(V9fsPDU *, V9fsFidState *, struct dirent **);

off_t v9fs_co_telldir(V9fsPDU *, V9fsFidState *);

void v9fs_co_seekdir(V9fsPDU *, V9fsFidState *, off_t);

void v9fs_co_rewinddir(V9fsPDU *, V9fsFidState *);

int v9fs_co_statfs(V9fsPDU *, V9fsPath *, struct statfs *);

int v9fs_co_lstat(V9fsPDU *, V9fsPath *, struct stat *);

int v9fs_co_chmod(V9fsPDU *, V9fsPath *, mode_t);

int v9fs_co_utimensat(V9fsPDU *, V9fsPath *, struct timespec [2]);

int v9fs_co_chown(V9fsPDU *, V9fsPath *, uid_t, gid_t);

int v9fs_co_truncate(V9fsPDU *, V9fsPath *, off_t);

int v9fs_co_llistxattr(V9fsPDU *, V9fsPath *, void *, size_t);

int v9fs_co_lgetxattr(V9fsPDU *, V9fsPath *,

int coroutine_fn v9fs_co_readlink(V9fsPDU *, V9fsPath *, V9fsString *);

int coroutine_fn v9fs_co_readdir(V9fsPDU *, V9fsFidState *, struct dirent **);

off_t coroutine_fn v9fs_co_telldir(V9fsPDU *, V9fsFidState *);

void coroutine_fn v9fs_co_seekdir(V9fsPDU *, V9fsFidState *, off_t);

void coroutine_fn v9fs_co_rewinddir(V9fsPDU *, V9fsFidState *);

int coroutine_fn v9fs_co_statfs(V9fsPDU *, V9fsPath *, struct statfs *);

int coroutine_fn v9fs_co_lstat(V9fsPDU *, V9fsPath *, struct stat *);

int coroutine_fn v9fs_co_chmod(V9fsPDU *, V9fsPath *, mode_t);

int coroutine_fn v9fs_co_utimensat(V9fsPDU *, V9fsPath *, struct timespec [2]);

int coroutine_fn v9fs_co_chown(V9fsPDU *, V9fsPath *, uid_t, gid_t);

int coroutine_fn v9fs_co_truncate(V9fsPDU *, V9fsPath *, off_t);

int coroutine_fn v9fs_co_llistxattr(V9fsPDU *, V9fsPath *, void *, size_t);

int coroutine_fn v9fs_co_lgetxattr(V9fsPDU *, V9fsPath *,

                                   V9fsString *, void *, size_t);

int v9fs_co_mknod(V9fsPDU *, V9fsFidState *, V9fsString *, uid_t,

int coroutine_fn v9fs_co_mknod(V9fsPDU *, V9fsFidState *, V9fsString *, uid_t,

                               gid_t, dev_t, mode_t, struct stat *);

int v9fs_co_mkdir(V9fsPDU *, V9fsFidState *, V9fsString *,

int coroutine_fn v9fs_co_mkdir(V9fsPDU *, V9fsFidState *, V9fsString *,

                               mode_t, uid_t, gid_t, struct stat *);

int v9fs_co_remove(V9fsPDU *, V9fsPath *);

int v9fs_co_rename(V9fsPDU *, V9fsPath *, V9fsPath *);

int v9fs_co_unlinkat(V9fsPDU *, V9fsPath *, V9fsString *, int flags);

int v9fs_co_renameat(V9fsPDU *, V9fsPath *, V9fsString *,

int coroutine_fn v9fs_co_remove(V9fsPDU *, V9fsPath *);

int coroutine_fn v9fs_co_rename(V9fsPDU *, V9fsPath *, V9fsPath *);

int coroutine_fn v9fs_co_unlinkat(V9fsPDU *, V9fsPath *, V9fsString *,

                                  int flags);

int coroutine_fn v9fs_co_renameat(V9fsPDU *, V9fsPath *, V9fsString *,

                                  V9fsPath *, V9fsString *);

int v9fs_co_fstat(V9fsPDU *, V9fsFidState *, struct stat *);

int v9fs_co_opendir(V9fsPDU *, V9fsFidState *);

int v9fs_co_open(V9fsPDU *, V9fsFidState *, int);

int v9fs_co_open2(V9fsPDU *, V9fsFidState *, V9fsString *,

int coroutine_fn v9fs_co_fstat(V9fsPDU *, V9fsFidState *, struct stat *);

int coroutine_fn v9fs_co_opendir(V9fsPDU *, V9fsFidState *);

int coroutine_fn v9fs_co_open(V9fsPDU *, V9fsFidState *, int);

int coroutine_fn v9fs_co_open2(V9fsPDU *, V9fsFidState *, V9fsString *,

                               gid_t, int, int, struct stat *);

int v9fs_co_lsetxattr(V9fsPDU *, V9fsPath *, V9fsString *,

int coroutine_fn v9fs_co_lsetxattr(V9fsPDU *, V9fsPath *, V9fsString *,

                                   void *, size_t, int);

int v9fs_co_lremovexattr(V9fsPDU *, V9fsPath *, V9fsString *);

int v9fs_co_closedir(V9fsPDU *, V9fsFidOpenState *);

int v9fs_co_close(V9fsPDU *, V9fsFidOpenState *);

int v9fs_co_fsync(V9fsPDU *, V9fsFidState *, int);

int v9fs_co_symlink(V9fsPDU *, V9fsFidState *, V9fsString *,

int coroutine_fn v9fs_co_lremovexattr(V9fsPDU *, V9fsPath *, V9fsString *);

int coroutine_fn v9fs_co_closedir(V9fsPDU *, V9fsFidOpenState *);

int coroutine_fn v9fs_co_close(V9fsPDU *, V9fsFidOpenState *);

int coroutine_fn v9fs_co_fsync(V9fsPDU *, V9fsFidState *, int);

int coroutine_fn v9fs_co_symlink(V9fsPDU *, V9fsFidState *, V9fsString *,

                                 const char *, gid_t, struct stat *);

int v9fs_co_link(V9fsPDU *, V9fsFidState *,

int coroutine_fn v9fs_co_link(V9fsPDU *, V9fsFidState *,

                              V9fsFidState *, V9fsString *);

int v9fs_co_pwritev(V9fsPDU *, V9fsFidState *,

int coroutine_fn v9fs_co_pwritev(V9fsPDU *, V9fsFidState *,

                                 struct iovec *, int, int64_t);

int v9fs_co_preadv(V9fsPDU *, V9fsFidState *,

int coroutine_fn v9fs_co_preadv(V9fsPDU *, V9fsFidState *,

                                struct iovec *, int, int64_t);

int v9fs_co_name_to_path(V9fsPDU *, V9fsPath *,

int coroutine_fn v9fs_co_name_to_path(V9fsPDU *, V9fsPath *,

                                      const char *, V9fsPath *);

int v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t,

int coroutine_fn v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t,

                                V9fsStatDotl *v9stat);



#endif

hw/9pfs/coxattr.c

+10 −9
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#include "qemu/coroutine.h"

#include "coth.h"



int v9fs_co_llistxattr(V9fsPDU *pdu, V9fsPath *path, void *value, size_t size)

int coroutine_fn v9fs_co_llistxattr(V9fsPDU *pdu, V9fsPath *path, void *value,

                                    size_t size)

{

    int err;

    V9fsState *s = pdu->s;
@@ -37,9 +38,9 @@ int v9fs_co_llistxattr(V9fsPDU *pdu, V9fsPath *path, void *value, size_t size) 
    return err;

}



int v9fs_co_lgetxattr(V9fsPDU *pdu, V9fsPath *path,

                      V9fsString *xattr_name,

                      void *value, size_t size)

int coroutine_fn v9fs_co_lgetxattr(V9fsPDU *pdu, V9fsPath *path,

                                   V9fsString *xattr_name, void *value,

                                   size_t size)

{

    int err;

    V9fsState *s = pdu->s;
@@ -61,7 +62,7 @@ int v9fs_co_lgetxattr(V9fsPDU *pdu, V9fsPath *path, 
    return err;

}



int v9fs_co_lsetxattr(V9fsPDU *pdu, V9fsPath *path,

int coroutine_fn v9fs_co_lsetxattr(V9fsPDU *pdu, V9fsPath *path,

                                   V9fsString *xattr_name, void *value,

                                   size_t size, int flags)

{
@@ -85,7 +86,7 @@ int v9fs_co_lsetxattr(V9fsPDU *pdu, V9fsPath *path, 
    return err;

}



int v9fs_co_lremovexattr(V9fsPDU *pdu, V9fsPath *path,

int coroutine_fn v9fs_co_lremovexattr(V9fsPDU *pdu, V9fsPath *path,

                                      V9fsString *xattr_name)

{

    int err;